Commit e65a2caf authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: hda/conexant: Convert to cdev-variant of mic-mute LED controls 



This patch converts the remaining user of
snd_hda_gen_add_micmute_led() in Conexant codec driver into the new
snd_hda_gen_add_micmute_led_cdev().

Tested-by: default avatarKai-Heng Feng <kai.heng.feng@canonical.com>
Link: https://lore.kernel.org/r/20200618110842.27238-5-tiwai@suse.de


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 8a503555

sound/pci/hda/patch_conexant.c

+6 −4
Original line number Diff line number Diff line
@@ -640,12 +640,14 @@ static void cxt_fixup_gpio_mute_hook(void *private_data, int enabled) 
}



/* turn on/off mic-mute LED via GPIO per capture hook */

static void cxt_gpio_micmute_update(struct hda_codec *codec)

static int cxt_gpio_micmute_update(struct led_classdev *led_cdev,

				   enum led_brightness brightness)

{

	struct hda_codec *codec = dev_to_hda_codec(led_cdev->dev->parent);

	struct conexant_spec *spec = codec->spec;



	cxt_update_gpio_led(codec, spec->gpio_mic_led_mask,

			    spec->gen.micmute_led.led_value);

	cxt_update_gpio_led(codec, spec->gpio_mic_led_mask, brightness);

	return 0;

}
@@ -665,7 +667,7 @@ static void cxt_fixup_mute_led_gpio(struct hda_codec *codec, 
		spec->mute_led_polarity = 0;

		spec->gpio_mute_led_mask = 0x01;

		spec->gpio_mic_led_mask = 0x02;

		snd_hda_gen_add_micmute_led(codec, cxt_gpio_micmute_update);

		snd_hda_gen_add_micmute_led_cdev(codec, cxt_gpio_micmute_update);

	}

	snd_hda_add_verbs(codec, gpio_init);

	if (spec->gpio_led)

CRA Git | Maintained and supported by SUSTech CRA and CCSE