Commit 74729469 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Takashi Iwai

ALSA: hda/tegra: avoid build error without CONFIG_PM

The #ifdef protection around the PM functions is wrong, leading to
a failed reference in some configurations:

sound/pci/hda/hda_tegra.c: In function 'hda_tegra_runtime_suspend':
sound/pci/hda/hda_tegra.c:273:2: error: implicit declaration of function 'hda_tegra_disable_clocks'; did you mean 'hda_tegra_enable_clocks'? [-Werror=implicit-function-declaration]

Better remove the #ifdefs entirely and rely on the compiler silently
dropping unused functions marked __maybe_unused.

Fixes: 707e0759 ("ALSA: hda/tegra: implement runtime suspend/resume")
Acked-by: default avatarThierry Reding <treding@nvidia.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent a2c6433e
...@@ -219,7 +219,6 @@ static int hda_tegra_enable_clocks(struct hda_tegra *data) ...@@ -219,7 +219,6 @@ static int hda_tegra_enable_clocks(struct hda_tegra *data)
return rc; return rc;
} }
#ifdef CONFIG_PM_SLEEP
static void hda_tegra_disable_clocks(struct hda_tegra *data) static void hda_tegra_disable_clocks(struct hda_tegra *data)
{ {
clk_disable_unprepare(data->hda2hdmi_clk); clk_disable_unprepare(data->hda2hdmi_clk);
...@@ -230,7 +229,7 @@ static void hda_tegra_disable_clocks(struct hda_tegra *data) ...@@ -230,7 +229,7 @@ static void hda_tegra_disable_clocks(struct hda_tegra *data)
/* /*
* power management * power management
*/ */
static int hda_tegra_suspend(struct device *dev) static int __maybe_unused hda_tegra_suspend(struct device *dev)
{ {
struct snd_card *card = dev_get_drvdata(dev); struct snd_card *card = dev_get_drvdata(dev);
int rc; int rc;
...@@ -243,7 +242,7 @@ static int hda_tegra_suspend(struct device *dev) ...@@ -243,7 +242,7 @@ static int hda_tegra_suspend(struct device *dev)
return 0; return 0;
} }
static int hda_tegra_resume(struct device *dev) static int __maybe_unused hda_tegra_resume(struct device *dev)
{ {
struct snd_card *card = dev_get_drvdata(dev); struct snd_card *card = dev_get_drvdata(dev);
int rc; int rc;
...@@ -255,10 +254,8 @@ static int hda_tegra_resume(struct device *dev) ...@@ -255,10 +254,8 @@ static int hda_tegra_resume(struct device *dev)
return 0; return 0;
} }
#endif /* CONFIG_PM_SLEEP */
#ifdef CONFIG_PM static int __maybe_unused hda_tegra_runtime_suspend(struct device *dev)
static int hda_tegra_runtime_suspend(struct device *dev)
{ {
struct snd_card *card = dev_get_drvdata(dev); struct snd_card *card = dev_get_drvdata(dev);
struct azx *chip = card->private_data; struct azx *chip = card->private_data;
...@@ -275,7 +272,7 @@ static int hda_tegra_runtime_suspend(struct device *dev) ...@@ -275,7 +272,7 @@ static int hda_tegra_runtime_suspend(struct device *dev)
return 0; return 0;
} }
static int hda_tegra_runtime_resume(struct device *dev) static int __maybe_unused hda_tegra_runtime_resume(struct device *dev)
{ {
struct snd_card *card = dev_get_drvdata(dev); struct snd_card *card = dev_get_drvdata(dev);
struct azx *chip = card->private_data; struct azx *chip = card->private_data;
...@@ -292,7 +289,6 @@ static int hda_tegra_runtime_resume(struct device *dev) ...@@ -292,7 +289,6 @@ static int hda_tegra_runtime_resume(struct device *dev)
return 0; return 0;
} }
#endif /* CONFIG_PM */
static const struct dev_pm_ops hda_tegra_pm = { static const struct dev_pm_ops hda_tegra_pm = {
SET_SYSTEM_SLEEP_PM_OPS(hda_tegra_suspend, hda_tegra_resume) SET_SYSTEM_SLEEP_PM_OPS(hda_tegra_suspend, hda_tegra_resume)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment