ALSA: hda/alc269: Drop superfluous GPIO write at resume
PATCH 1/1 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.
Signed-off-by Takashi Iwai <[email protected]>
--- sound/hda/codecs/realtek/alc269.c | 7 ------- sound/hda/codecs/realtek/realtek.c | 12 ++---------- sound/hda/codecs/realtek/realtek.h | 1 - 3 files changed, 2 insertions(+), 18 deletions(-)
sound/hda/codecs/realtek/alc269.c +0 -7
@@ -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
@@ -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
@@ -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);
Signature · 1 line
2.53.0