Commit d2d83756 authored by Nathan Chancellor's avatar Nathan Chancellor Committed by Takashi Iwai
Browse files

ALSA: hda/analog - Sink ad198x_shutup() and shuffle CONFIG_PM guards 



When CONFIG_PM is not set, there is an unused function warning:

sound/pci/hda/patch_analog.c:115:13: warning: unused function
'ad198x_shutup' [-Wunused-function]
static void ad198x_shutup(struct hda_codec *codec)
            ^
1 warning generated.

Sink ad198x_shutup() into ad198x_suspend(), as it is only called in that
one space. Move the CONFIG_PM guards above ad198x_power_eapd_write() as
it is only called in ad198x_power_eapd(), which is in turn only called
in ad198x_power_eapd(). Those two functions are large enough that they
are left alone.

Fixes: 327b34f2 ("ALSA: hda: Nuke unused reboot_notify callback")
Signed-off-by: default avatarNathan Chancellor <nathan@kernel.org>
Link: https://lore.kernel.org/r/20210818012705.311963-2-nathan@kernel.org


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

sound/pci/hda/patch_analog.c

+2 −8
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ static int create_beep_ctls(struct hda_codec *codec) 
#define create_beep_ctls(codec)		0

#endif





#ifdef CONFIG_PM

static void ad198x_power_eapd_write(struct hda_codec *codec, hda_nid_t front,

				hda_nid_t hp)

{
@@ -112,16 +112,10 @@ static void ad198x_power_eapd(struct hda_codec *codec) 
	}

}



static void ad198x_shutup(struct hda_codec *codec)

static int ad198x_suspend(struct hda_codec *codec)

{

	snd_hda_shutup_pins(codec);

	ad198x_power_eapd(codec);

}



#ifdef CONFIG_PM

static int ad198x_suspend(struct hda_codec *codec)

{

	ad198x_shutup(codec);

	return 0;

}

#endif