Commit 184e302b authored by Takashi Iwai's avatar Takashi Iwai

ALSA: hda/conexant - Use the mic-mute LED helper

Convert to use the common helper for controlling the mic mute LED for
HP laptops, just as we've done for Realtek codecs.  This will give the
mic mute LED enum as gratis.
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent d03abeca
...@@ -695,16 +695,12 @@ static void cxt_fixup_gpio_mute_hook(void *private_data, int enabled) ...@@ -695,16 +695,12 @@ static void cxt_fixup_gpio_mute_hook(void *private_data, int enabled)
} }
/* turn on/off mic-mute LED via GPIO per capture hook */ /* turn on/off mic-mute LED via GPIO per capture hook */
static void cxt_fixup_gpio_mic_mute_hook(struct hda_codec *codec, static void cxt_gpio_micmute_update(struct hda_codec *codec)
struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
{ {
struct conexant_spec *spec = codec->spec; struct conexant_spec *spec = codec->spec;
if (ucontrol) cxt_update_gpio_led(codec, spec->gpio_mic_led_mask,
cxt_update_gpio_led(codec, spec->gpio_mic_led_mask, spec->gen.micmute_led.led_value);
ucontrol->value.integer.value[0] ||
ucontrol->value.integer.value[1]);
} }
...@@ -721,11 +717,11 @@ static void cxt_fixup_mute_led_gpio(struct hda_codec *codec, ...@@ -721,11 +717,11 @@ static void cxt_fixup_mute_led_gpio(struct hda_codec *codec,
if (action == HDA_FIXUP_ACT_PRE_PROBE) { if (action == HDA_FIXUP_ACT_PRE_PROBE) {
spec->gen.vmaster_mute.hook = cxt_fixup_gpio_mute_hook; spec->gen.vmaster_mute.hook = cxt_fixup_gpio_mute_hook;
spec->gen.cap_sync_hook = cxt_fixup_gpio_mic_mute_hook;
spec->gpio_led = 0; spec->gpio_led = 0;
spec->mute_led_polarity = 0; spec->mute_led_polarity = 0;
spec->gpio_mute_led_mask = 0x01; spec->gpio_mute_led_mask = 0x01;
spec->gpio_mic_led_mask = 0x02; spec->gpio_mic_led_mask = 0x02;
snd_hda_gen_add_micmute_led(codec, cxt_gpio_micmute_update);
} }
snd_hda_add_verbs(codec, gpio_init); snd_hda_add_verbs(codec, gpio_init);
if (spec->gpio_led) if (spec->gpio_led)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment