Commit d34e4e00 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: platform: Check CONFIG_PM_SLEEP instead of CONFIG_PM 



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: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 94c142a1

sound/arm/pxa2xx-ac97.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -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

	},

	},

sound/atmel/abdac.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -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);

sound/atmel/ac97c.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -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);

sound/drivers/aloop.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -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);

sound/drivers/dummy.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE