Commit 01f218d4 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: hda/alc269: Drop superfluous GPIO write at resume 

alc269_resume() has an extra code to write GPIO data, but this is
basically already done in the standard alc_init(), hence it's
superfluous.  Let's drop the code.

Since all external callers of alc_write_gpio_data() are gone after
this, fold the only usage of alc_write_gpio_data() into the caller and
drop the export as well.

Link: https://patch.msgid.link/20260409143735.1412134-1-tiwai@suse.de


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

sound/hda/codecs/realtek/alc269.c

+0 −7
Original line number Diff line number Diff line
@@ -1004,13 +1004,6 @@ static int alc269_resume(struct hda_codec *codec) 
	snd_hda_regmap_sync(codec);

	hda_call_check_power_status(codec, 0x01);



	/* on some machine, the BIOS will clear the codec gpio data when enter

	 * suspend, and won't restore the data after resume, so we restore it

	 * in the driver.

	 */

	if (spec->gpio_data)

		alc_write_gpio_data(codec);



	if (spec->has_alc5505_dsp)

		alc5505_dsp_resume(codec);

sound/hda/codecs/realtek/realtek.c

+2 −10
Original line number Diff line number Diff line
@@ -99,15 +99,6 @@ void alc_setup_gpio(struct hda_codec *codec, unsigned int mask) 
}

EXPORT_SYMBOL_NS_GPL(alc_setup_gpio, "SND_HDA_CODEC_REALTEK");



void alc_write_gpio_data(struct hda_codec *codec)

{

	struct alc_spec *spec = codec->spec;



	snd_hda_codec_write(codec, 0x01, 0, AC_VERB_SET_GPIO_DATA,

			    spec->gpio_data);

}

EXPORT_SYMBOL_NS_GPL(alc_write_gpio_data, "SND_HDA_CODEC_REALTEK");



void alc_update_gpio_data(struct hda_codec *codec, unsigned int mask,

			  bool on)

{
@@ -119,7 +110,8 @@ void alc_update_gpio_data(struct hda_codec *codec, unsigned int mask, 
	else

		spec->gpio_data &= ~mask;

	if (oldval != spec->gpio_data)

		alc_write_gpio_data(codec);

		snd_hda_codec_write(codec, 0x01, 0, AC_VERB_SET_GPIO_DATA,

				    spec->gpio_data);

}

EXPORT_SYMBOL_NS_GPL(alc_update_gpio_data, "SND_HDA_CODEC_REALTEK");

sound/hda/codecs/realtek/realtek.h

+0 −1
Original line number Diff line number Diff line
@@ -168,7 +168,6 @@ void alc_process_coef_fw(struct hda_codec *codec, const struct coef_fw *fw); 
 * GPIO helpers

 */

void alc_setup_gpio(struct hda_codec *codec, unsigned int mask);

void alc_write_gpio_data(struct hda_codec *codec);

void alc_update_gpio_data(struct hda_codec *codec, unsigned int mask,

			  bool on);