leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ALSA: platform: Check CONFIG_PM_SLEEP instead of CONFIG_PM

Browse Source 
When CONFIG_PM is set but CONFIG_PM_SLEEP is unset,
SIMPLE_DEV_PM_OPS() ignores the given functions, and this leads to
compile warnings.

For avoiding this, simply check CONFIG_PM_SLEEP instead of CONFIG_PM.

Reported-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2012-08-09 15:47:15 +02:00
parent 94c142a160
commit d34e4e00ad
7 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sound/arm/pxa2xx-ac97.c
View File

@ -106,7 +106,7 @@ static struct pxa2xx_pcm_client pxa2xx_ac97_pcm_client = {
.prepare = pxa2xx_ac97_pcm_prepare, .prepare = pxa2xx_ac97_pcm_prepare,
}; };
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
static int pxa2xx_ac97_do_suspend(struct snd_card *card) static int pxa2xx_ac97_do_suspend(struct snd_card *card)
{ {
@ -243,7 +243,7 @@ static struct platform_driver pxa2xx_ac97_driver = {
.driver = { .driver = {
.name = "pxa2xx-ac97", .name = "pxa2xx-ac97",
.owner = THIS_MODULE, .owner = THIS_MODULE,
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
.pm = &pxa2xx_ac97_pm_ops, .pm = &pxa2xx_ac97_pm_ops,
#endif #endif
}, },

2
sound/atmel/abdac.c
View File

@ -534,7 +534,7 @@ out_put_pclk:
return retval; return retval;
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
static int atmel_abdac_suspend(struct device *pdev) static int atmel_abdac_suspend(struct device *pdev)
{ {
struct snd_card *card = dev_get_drvdata(pdev); struct snd_card *card = dev_get_drvdata(pdev);

2
sound/atmel/ac97c.c
View File

@ -1134,7 +1134,7 @@ err_snd_card_new:
return retval; return retval;
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
static int atmel_ac97c_suspend(struct device *pdev) static int atmel_ac97c_suspend(struct device *pdev)
{ {
struct snd_card *card = dev_get_drvdata(pdev); struct snd_card *card = dev_get_drvdata(pdev);

2
sound/drivers/aloop.c
View File

@ -1176,7 +1176,7 @@ static int __devexit loopback_remove(struct platform_device *devptr)
return 0; return 0;
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
static int loopback_suspend(struct device *pdev) static int loopback_suspend(struct device *pdev)
{ {
struct snd_card *card = dev_get_drvdata(pdev); struct snd_card *card = dev_get_drvdata(pdev);

2
sound/drivers/dummy.c
View File

@ -1064,7 +1064,7 @@ static int __devexit snd_dummy_remove(struct platform_device *devptr)
return 0; return 0;
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
static int snd_dummy_suspend(struct device *pdev) static int snd_dummy_suspend(struct device *pdev)
{ {
struct snd_card *card = dev_get_drvdata(pdev); struct snd_card *card = dev_get_drvdata(pdev);

4
sound/drivers/pcsp/pcsp.c
View File

@ -199,7 +199,7 @@ static void pcsp_stop_beep(struct snd_pcsp *chip)
pcspkr_stop_sound(); pcspkr_stop_sound();
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
static int pcsp_suspend(struct device *dev) static int pcsp_suspend(struct device *dev)
{ {
struct snd_pcsp *chip = dev_get_drvdata(dev); struct snd_pcsp *chip = dev_get_drvdata(dev);
@ -212,7 +212,7 @@ static SIMPLE_DEV_PM_OPS(pcsp_pm, pcsp_suspend, NULL);
#define PCSP_PM_OPS &pcsp_pm #define PCSP_PM_OPS &pcsp_pm
#else #else
#define PCSP_PM_OPS NULL #define PCSP_PM_OPS NULL
#endif /* CONFIG_PM */ #endif /* CONFIG_PM_SLEEP */
static void pcsp_shutdown(struct platform_device *dev) static void pcsp_shutdown(struct platform_device *dev)
{ {

2
sound/ppc/powermac.c
View File

@ -143,7 +143,7 @@ static int __devexit snd_pmac_remove(struct platform_device *devptr)
return 0; return 0;
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
static int snd_pmac_driver_suspend(struct device *dev) static int snd_pmac_driver_suspend(struct device *dev)
{ {
struct snd_card *card = dev_get_drvdata(dev); struct snd_card *card = dev_get_drvdata(dev);