Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2ba9fd0d authored by Mike Rapoport's avatar Mike Rapoport Committed by Eric Miao
Browse files

[ARM] pxa: update pxa2xx-ac97.c to use 'struct dev_pm_ops' 



Signed-off-by: default avatarMike Rapoport <mike@compulab.co.il>
Signed-off-by: default avatarEric Miao <eric.y.miao@gmail.com>
parent 4f3edfe3

sound/arm/pxa2xx-ac97.c

+11 −9
Original line number Diff line number Diff line
@@ -137,9 +137,9 @@ static int pxa2xx_ac97_do_resume(struct snd_card *card) 
	return 0;

}



static int pxa2xx_ac97_suspend(struct platform_device *dev, pm_message_t state)

static int pxa2xx_ac97_suspend(struct device *dev)

{

	struct snd_card *card = platform_get_drvdata(dev);

	struct snd_card *card = dev_get_drvdata(dev);

	int ret = 0;



	if (card)
@@ -148,9 +148,9 @@ static int pxa2xx_ac97_suspend(struct platform_device *dev, pm_message_t state) 
	return ret;

}



static int pxa2xx_ac97_resume(struct platform_device *dev)

static int pxa2xx_ac97_resume(struct device *dev)

{

	struct snd_card *card = platform_get_drvdata(dev);

	struct snd_card *card = dev_get_drvdata(dev);

	int ret = 0;



	if (card)
@@ -159,9 +159,10 @@ static int pxa2xx_ac97_resume(struct platform_device *dev) 
	return ret;

}



#else

#define pxa2xx_ac97_suspend	NULL

#define pxa2xx_ac97_resume	NULL

static struct dev_pm_ops pxa2xx_ac97_pm_ops = {

	.suspend	= pxa2xx_ac97_suspend,

	.resume		= pxa2xx_ac97_resume,

};

#endif



static int __devinit pxa2xx_ac97_probe(struct platform_device *dev)
@@ -231,11 +232,12 @@ static int __devexit pxa2xx_ac97_remove(struct platform_device *dev) 
static struct platform_driver pxa2xx_ac97_driver = {

	.probe		= pxa2xx_ac97_probe,

	.remove		= __devexit_p(pxa2xx_ac97_remove),

	.suspend	= pxa2xx_ac97_suspend,

	.resume		= pxa2xx_ac97_resume,

	.driver		= {

		.name	= "pxa2xx-ac97",

		.owner	= THIS_MODULE,

#ifdef CONFIG_PM

		.pm	= &pxa2xx_ac97_pm_ops,

#endif

	},

};