summaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/patch_sigmatel.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-10-27 20:47:07 +0200
committerTakashi Iwai <tiwai@suse.de>2011-11-16 11:10:16 +0100
commit04f5ade6afc4326dc6cd10d235500972fba548eb (patch)
tree14704ec6572b915e3516a9e2d038567448579342 /sound/pci/hda/patch_sigmatel.c
parent8b940fc457fbf883053caf397586a61bd3cae23e (diff)
downloadop-kernel-dev-04f5ade6afc4326dc6cd10d235500972fba548eb.zip
op-kernel-dev-04f5ade6afc4326dc6cd10d235500972fba548eb.tar.gz
ALSA: hda - Introduce snd_hda_get_pin_label()
Create a new helper function snd_hda_get_pin_label() for getting a label string for both input and output pins. hda_get_input_pin_label() is obsoleted by this function, and the callers are replaced appropriately now by this patch. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/patch_sigmatel.c')
-rw-r--r--sound/pci/hda/patch_sigmatel.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index 470f6f2..3b4ef0c 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -2872,7 +2872,7 @@ static inline int stac92xx_add_jack_mode_control(struct hda_codec *codec,
}
if (control) {
- strcpy(name, hda_get_input_pin_label(codec, nid, 1));
+ strcpy(name, snd_hda_get_pin_label(codec, nid, NULL));
return stac92xx_add_control(codec->spec, control,
strcat(name, " Jack Mode"), nid);
}
@@ -3563,7 +3563,7 @@ static int stac92xx_auto_create_dmic_input_ctls(struct hda_codec *codec,
if (index < 0)
continue;
- label = hda_get_input_pin_label(codec, nid, 1);
+ label = snd_hda_get_pin_label(codec, nid, NULL);
snd_hda_add_imux_item(dimux, label, index, &type_idx);
if (snd_hda_get_bool_hint(codec, "separate_dmux") != 1)
snd_hda_add_imux_item(imux, label, index, &type_idx);
OpenPOWER on IntegriCloud