summaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/hda_hwdep.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-02-23 09:42:57 +0100
committerTakashi Iwai <tiwai@suse.de>2009-02-23 09:42:57 +0100
commit346ff70fdbe9093947b9494fe714c89cafcceade (patch)
tree6c961c9c8956a291cad2e40c9b442022b2863769 /sound/pci/hda/hda_hwdep.c
parentc17a1abae2f29047a0f57324240b01609489261b (diff)
ALSA: hda - Rename {override,cur}_pin with {user,driver}_pin
Rename from override_pin and cur_pin with user_pin and driver_pin, respectively, to be a bit more intuitive. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/hda_hwdep.c')
-rw-r--r--sound/pci/hda/hda_hwdep.c32
1 files changed, 16 insertions, 16 deletions
diff --git a/sound/pci/hda/hda_hwdep.c b/sound/pci/hda/hda_hwdep.c
index 71039a6dec2..c660383ef38 100644
--- a/sound/pci/hda/hda_hwdep.c
+++ b/sound/pci/hda/hda_hwdep.c
@@ -109,7 +109,7 @@ static void clear_hwdep_elements(struct hda_codec *codec)
for (i = 0; i < codec->hints.used; i++, head++)
kfree(*head);
snd_array_free(&codec->hints);
- snd_array_free(&codec->override_pins);
+ snd_array_free(&codec->user_pins);
}
static void hwdep_free(struct snd_hwdep *hwdep)
@@ -142,7 +142,7 @@ int /*__devinit*/ snd_hda_create_hwdep(struct hda_codec *codec)
snd_array_init(&codec->init_verbs, sizeof(struct hda_verb), 32);
snd_array_init(&codec->hints, sizeof(char *), 32);
- snd_array_init(&codec->override_pins, sizeof(struct hda_pincfg), 16);
+ snd_array_init(&codec->user_pins, sizeof(struct hda_pincfg), 16);
return 0;
}
@@ -340,29 +340,29 @@ static ssize_t init_pin_configs_show(struct device *dev,
return pin_configs_show(codec, &codec->init_pins, buf);
}
-static ssize_t override_pin_configs_show(struct device *dev,
- struct device_attribute *attr,
- char *buf)
+static ssize_t user_pin_configs_show(struct device *dev,
+ struct device_attribute *attr,
+ char *buf)
{
struct snd_hwdep *hwdep = dev_get_drvdata(dev);
struct hda_codec *codec = hwdep->private_data;
- return pin_configs_show(codec, &codec->override_pins, buf);
+ return pin_configs_show(codec, &codec->user_pins, buf);
}
-static ssize_t cur_pin_configs_show(struct device *dev,
- struct device_attribute *attr,
- char *buf)
+static ssize_t driver_pin_configs_show(struct device *dev,
+ struct device_attribute *attr,
+ char *buf)
{
struct snd_hwdep *hwdep = dev_get_drvdata(dev);
struct hda_codec *codec = hwdep->private_data;
- return pin_configs_show(codec, &codec->cur_pins, buf);
+ return pin_configs_show(codec, &codec->driver_pins, buf);
}
#define MAX_PIN_CONFIGS 32
-static ssize_t override_pin_configs_store(struct device *dev,
- struct device_attribute *attr,
- const char *buf, size_t count)
+static ssize_t user_pin_configs_store(struct device *dev,
+ struct device_attribute *attr,
+ const char *buf, size_t count)
{
struct snd_hwdep *hwdep = dev_get_drvdata(dev);
struct hda_codec *codec = hwdep->private_data;
@@ -373,7 +373,7 @@ static ssize_t override_pin_configs_store(struct device *dev,
return -EINVAL;
if (!nid)
return -EINVAL;
- err = snd_hda_add_pincfg(codec, &codec->override_pins, nid, cfg);
+ err = snd_hda_add_pincfg(codec, &codec->user_pins, nid, cfg);
if (err < 0)
return err;
return count;
@@ -397,8 +397,8 @@ static struct device_attribute codec_attrs[] = {
CODEC_ATTR_WO(init_verbs),
CODEC_ATTR_WO(hints),
CODEC_ATTR_RO(init_pin_configs),
- CODEC_ATTR_RW(override_pin_configs),
- CODEC_ATTR_RO(cur_pin_configs),
+ CODEC_ATTR_RW(user_pin_configs),
+ CODEC_ATTR_RO(driver_pin_configs),
CODEC_ATTR_WO(reconfig),
CODEC_ATTR_WO(clear),
};