evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

spi/bcm63xx: fix pm sleep support

Browse source 
Use the correct symbol to guard the callbacks and use appropriate defines
for setting up the ops struct.

Signed-off-by: Jonas Gorski <jogo@openwrt.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
Jonas Gorski 2013-12-17 21:42:10 +01:00 • committed by Mark Brown
parent ea01e8a4cd
commit 1bae20285b
1 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
drivers/spi/spi-bcm63xx.c
View file

@ -438,7 +438,7 @@ static int bcm63xx_spi_remove(struct platform_device *pdev)
return 0; return 0;
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
static int bcm63xx_spi_suspend(struct device *dev) static int bcm63xx_spi_suspend(struct device *dev)
{ {
struct spi_master *master = dev_get_drvdata(dev); struct spi_master *master = dev_get_drvdata(dev);
@ -465,22 +465,17 @@ static int bcm63xx_spi_resume(struct device *dev)
return 0; return 0;
} }
#endif
static const struct dev_pm_ops bcm63xx_spi_pm_ops = { static const struct dev_pm_ops bcm63xx_spi_pm_ops = {
.suspend = bcm63xx_spi_suspend, SET_SYSTEM_SLEEP_PM_OPS(bcm63xx_spi_suspend, bcm63xx_spi_resume)
.resume = bcm63xx_spi_resume,
}; };
#define BCM63XX_SPI_PM_OPS (&bcm63xx_spi_pm_ops)
#else
#define BCM63XX_SPI_PM_OPS NULL
#endif
static struct platform_driver bcm63xx_spi_driver = { static struct platform_driver bcm63xx_spi_driver = {
.driver = { .driver = {
.name = "bcm63xx-spi", .name = "bcm63xx-spi",
.owner = THIS_MODULE, .owner = THIS_MODULE,
.pm = BCM63XX_SPI_PM_OPS, .pm = &bcm63xx_spi_pm_ops,
}, },
.probe = bcm63xx_spi_probe, .probe = bcm63xx_spi_probe,
.remove = bcm63xx_spi_remove, .remove = bcm63xx_spi_remove,