Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

ALSA: hda/realtek - Consolidate gpio_data and gpio_led 



Until now, two fields, gpio_data and gpio_led, coexist in alc_spec
although basically both of them serve for the same purpose -- the GPIO
data bits.

This patch consolidates both usages and eliminates the superfluous
gpio_led field.

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

sound/pci/hda/patch_realtek.c

+4 −24
Original line number Diff line number Diff line
@@ -100,7 +100,6 @@ struct alc_spec { 
	hda_nid_t mute_led_nid;

	hda_nid_t cap_mute_led_nid;



	unsigned int gpio_led; /* used for alc269_fixup_hp_gpio_led() */

	unsigned int gpio_mute_led_mask;

	unsigned int gpio_mic_led_mask;
@@ -3497,9 +3496,8 @@ static int alc269_resume(struct hda_codec *codec) 
	 * suspend, and won't restore the data after resume, so we restore it

	 * in the driver.

	 */

	if (spec->gpio_led)

		snd_hda_codec_write(codec, codec->core.afg, 0, AC_VERB_SET_GPIO_DATA,

			    spec->gpio_led);

	if (spec->gpio_data)

		alc_write_gpio_data(codec);



	if (spec->has_alc5505_dsp)

		alc5505_dsp_resume(codec);
@@ -3739,18 +3737,10 @@ static void alc_update_gpio_led(struct hda_codec *codec, unsigned int mask, 
				bool enabled)

{

	struct alc_spec *spec = codec->spec;

	unsigned int oldval = spec->gpio_led;



	if (spec->mute_led_polarity)

		enabled = !enabled;



	if (enabled)

		spec->gpio_led &= ~mask;

	else

		spec->gpio_led |= mask;

	if (spec->gpio_led != oldval)

		snd_hda_codec_write(codec, 0x01, 0, AC_VERB_SET_GPIO_DATA,

				    spec->gpio_led);

	alc_update_gpio_data(codec, mask, !enabled); /* muted -> LED on */

}



/* turn on/off mute LED via GPIO per vmaster hook */
@@ -3783,7 +3773,6 @@ static void alc269_fixup_hp_gpio_led(struct hda_codec *codec, 


	if (action == HDA_FIXUP_ACT_PRE_PROBE) {

		spec->gen.vmaster_mute.hook = alc_fixup_gpio_mute_hook;

		spec->gpio_led = 0;

		spec->mute_led_polarity = 0;

		spec->gpio_mute_led_mask = 0x08;

		spec->gpio_mic_led_mask = 0x10;
@@ -3804,7 +3793,6 @@ static void alc286_fixup_hp_gpio_led(struct hda_codec *codec, 


	if (action == HDA_FIXUP_ACT_PRE_PROBE) {

		spec->gen.vmaster_mute.hook = alc_fixup_gpio_mute_hook;

		spec->gpio_led = 0;

		spec->mute_led_polarity = 0;

		spec->gpio_mute_led_mask = 0x02;

		spec->gpio_mic_led_mask = 0x20;
@@ -3842,7 +3830,6 @@ static void alc269_fixup_hp_gpio_mic1_led(struct hda_codec *codec, 


	if (action == HDA_FIXUP_ACT_PRE_PROBE) {

		spec->gen.vmaster_mute.hook = alc_fixup_gpio_mute_hook;

		spec->gpio_led = 0;

		spec->mute_led_polarity = 0;

		spec->gpio_mute_led_mask = 0x08;

		spec->cap_mute_led_nid = 0x18;
@@ -3865,7 +3852,6 @@ static void alc280_fixup_hp_gpio4(struct hda_codec *codec, 


	if (action == HDA_FIXUP_ACT_PRE_PROBE) {

		spec->gen.vmaster_mute.hook = alc_fixup_gpio_mute_hook;

		spec->gpio_led = 0;

		spec->mute_led_polarity = 0;

		spec->gpio_mute_led_mask = 0x08;

		spec->cap_mute_led_nid = 0x18;
@@ -3948,7 +3934,6 @@ static void alc280_fixup_hp_gpio2_mic_hotkey(struct hda_codec *codec, 
						    gpio2_mic_hotkey_event);



		spec->gen.vmaster_mute.hook = alc_fixup_gpio_mute_hook;

		spec->gpio_led = 0;

		spec->mute_led_polarity = 0;

		spec->gpio_mute_led_mask = 0x08;

		spec->gpio_mic_led_mask = 0x10;
@@ -3988,7 +3973,6 @@ static void alc233_fixup_lenovo_line2_mic_hotkey(struct hda_codec *codec, 
		snd_hda_jack_detect_enable_callback(codec, 0x1b,

						    gpio2_mic_hotkey_event);



		spec->gpio_led = 0;

		spec->mute_led_polarity = 0;

		spec->gpio_mic_led_mask = 0x04;

		snd_hda_gen_add_micmute_led(codec, alc_gpio_micmute_update);
@@ -5365,9 +5349,6 @@ static void alc280_fixup_hp_9480m(struct hda_codec *codec, 
		spec->gen.vmaster_mute.hook = alc_fixup_gpio_mute_hook;

		spec->gen.hp_automute_hook = alc280_hp_gpio4_automute_hook;



		/* The GPIOs are currently off */

		spec->gpio_led = 0;



		/* GPIO3 is connected to the output mute LED,

		 * high is on, low is off

		 */
@@ -7592,7 +7573,7 @@ static unsigned int gpio_led_power_filter(struct hda_codec *codec, 
					  unsigned int power_state)

{

	struct alc_spec *spec = codec->spec;

	if (nid == codec->core.afg && power_state == AC_PWRST_D3 && spec->gpio_led)

	if (nid == codec->core.afg && power_state == AC_PWRST_D3 && spec->gpio_data)

		return AC_PWRST_D0;

	return power_state;

}
@@ -7609,7 +7590,6 @@ static void alc662_fixup_led_gpio1(struct hda_codec *codec, 


	if (action == HDA_FIXUP_ACT_PRE_PROBE) {

		spec->gen.vmaster_mute.hook = alc_fixup_gpio_mute_hook;

		spec->gpio_led = 0;

		spec->mute_led_polarity = 1;

		spec->gpio_mute_led_mask = 0x01;

		snd_hda_add_verbs(codec, gpio_init);