aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/patch_analog.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-09-09 08:50:17 -0400
committerTakashi Iwai <tiwai@suse.de>2010-09-09 10:46:01 -0400
commit86e2959a10828dd2614e037fb2502bc833adca52 (patch)
tree4d5d2a60d23958d49ac8aebcb985b71d27305b01 /sound/pci/hda/patch_analog.c
parentb5786e85cb2ffd0b07e86dec38a442bd20765ad8 (diff)
ALSA: hda - Remove AUTO_PIN_FRONT_{MIC|LINE}
We can assign multiple pins to a single role now, let's reduce the redundant FRONT_MIC and FRONT_LINE. Also, autocfg->input_pins[] is no longer used, so this is removed as well. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/patch_analog.c')
-rw-r--r--sound/pci/hda/patch_analog.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c
index 8de3a0dc45e4..85fc0b954603 100644
--- a/sound/pci/hda/patch_analog.c
+++ b/sound/pci/hda/patch_analog.c
@@ -2923,7 +2923,7 @@ static int ad1988_auto_create_analog_input_ctls(struct ad198x_spec *spec,
2923 type_idx = 0; 2923 type_idx = 0;
2924 err = new_analog_input(spec, cfg->inputs[i].pin, 2924 err = new_analog_input(spec, cfg->inputs[i].pin,
2925 auto_pin_cfg_labels[type], type_idx, 2925 auto_pin_cfg_labels[type], type_idx,
2926 type <= AUTO_PIN_FRONT_MIC); 2926 type == AUTO_PIN_MIC);
2927 if (err < 0) 2927 if (err < 0)
2928 return err; 2928 return err;
2929 snd_hda_get_input_pin_label(cfg, i, 2929 snd_hda_get_input_pin_label(cfg, i,
@@ -3015,7 +3015,7 @@ static void ad1988_auto_init_analog_input(struct hda_codec *codec)
3015 break; 3015 break;
3016 } 3016 }
3017 snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_PIN_WIDGET_CONTROL, 3017 snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,
3018 i <= AUTO_PIN_FRONT_MIC ? PIN_VREF80 : PIN_IN); 3018 i == AUTO_PIN_MIC ? PIN_VREF80 : PIN_IN);
3019 if (nid != AD1988_PIN_CD_NID) 3019 if (nid != AD1988_PIN_CD_NID)
3020 snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_AMP_GAIN_MUTE, 3020 snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_AMP_GAIN_MUTE,
3021 AMP_OUT_MUTE); 3021 AMP_OUT_MUTE);