diff options
| author | Jaroslav Kysela <perex@perex.cz> | 2009-12-10 13:57:01 +0100 |
|---|---|---|
| committer | Jaroslav Kysela <perex@perex.cz> | 2009-12-15 09:33:32 +0100 |
| commit | 5e26dfd0615868872cb44842f1e1428c7b414ab0 (patch) | |
| tree | 75472db826d948edde152969045a819653ac54b3 /sound/pci/hda/patch_cirrus.c | |
| parent | 9e3fd8719f624a43575b56a4777b1552399a8be8 (diff) | |
| download | linux-3.10-5e26dfd0615868872cb44842f1e1428c7b414ab0.tar.gz linux-3.10-5e26dfd0615868872cb44842f1e1428c7b414ab0.tar.bz2 linux-3.10-5e26dfd0615868872cb44842f1e1428c7b414ab0.zip | |
ALSA: hda - simplify usage of HDA_SUBDEV_AMP_FLAG
The HDA_SUBDEV_NID_FLAG is duplicate for amplifier control elements. Move
get_amp_nid_() call to the snd_hda_ctl_add() function.
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'sound/pci/hda/patch_cirrus.c')
| -rw-r--r-- | sound/pci/hda/patch_cirrus.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/hda/patch_cirrus.c b/sound/pci/hda/patch_cirrus.c index e51f6658aa2..eeb91f6a06c 100644 --- a/sound/pci/hda/patch_cirrus.c +++ b/sound/pci/hda/patch_cirrus.c @@ -501,7 +501,7 @@ static int add_mute(struct hda_codec *codec, const char *name, int index, snprintf(tmp, sizeof(tmp), "%s %s Switch", name, dir_sfx[dir]); *kctlp = snd_ctl_new1(&knew, codec); (*kctlp)->id.subdevice = HDA_SUBDEV_AMP_FLAG; - return snd_hda_ctl_add(codec, get_amp_nid_(pval), *kctlp); + return snd_hda_ctl_add(codec, 0, *kctlp); } static int add_volume(struct hda_codec *codec, const char *name, @@ -515,7 +515,7 @@ static int add_volume(struct hda_codec *codec, const char *name, snprintf(tmp, sizeof(tmp), "%s %s Volume", name, dir_sfx[dir]); *kctlp = snd_ctl_new1(&knew, codec); (*kctlp)->id.subdevice = HDA_SUBDEV_AMP_FLAG; - return snd_hda_ctl_add(codec, get_amp_nid_(pval), *kctlp); + return snd_hda_ctl_add(codec, 0, *kctlp); } static void fix_volume_caps(struct hda_codec *codec, hda_nid_t dac) |