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