Browse Source

spi: sirf: use SET_SYSTEM_SLEEP_PM_OPS to initialize PM entries

use SET_SYSTEM_SLEEP_PM_OPS to initialize PM entries, this makes the codes
clean and also enable the ability of hibernation support for sirf SPI.

Signed-off-by: Qipan Li <Qipan.Li@csr.com>
Signed-off-by: Barry Song <Baohua.Song@csr.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Qipan Li 11 years ago
parent
commit
facffed297
1 changed files with 3 additions and 6 deletions
  1. 3 6
      drivers/spi/spi-sirf.c

+ 3 - 6
drivers/spi/spi-sirf.c

@@ -693,7 +693,7 @@ static int  spi_sirfsoc_remove(struct platform_device *pdev)
 	return 0;
 	return 0;
 }
 }
 
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 static int spi_sirfsoc_suspend(struct device *dev)
 static int spi_sirfsoc_suspend(struct device *dev)
 {
 {
 	struct spi_master *master = dev_get_drvdata(dev);
 	struct spi_master *master = dev_get_drvdata(dev);
@@ -716,12 +716,11 @@ static int spi_sirfsoc_resume(struct device *dev)
 
 
 	return 0;
 	return 0;
 }
 }
+#endif
 
 
 static const struct dev_pm_ops spi_sirfsoc_pm_ops = {
 static const struct dev_pm_ops spi_sirfsoc_pm_ops = {
-	.suspend = spi_sirfsoc_suspend,
-	.resume = spi_sirfsoc_resume,
+	SET_SYSTEM_SLEEP_PM_OPS(spi_sirfsoc_suspend, spi_sirfsoc_resume)
 };
 };
-#endif
 
 
 static const struct of_device_id spi_sirfsoc_of_match[] = {
 static const struct of_device_id spi_sirfsoc_of_match[] = {
 	{ .compatible = "sirf,prima2-spi", },
 	{ .compatible = "sirf,prima2-spi", },
@@ -734,9 +733,7 @@ static struct platform_driver spi_sirfsoc_driver = {
 	.driver = {
 	.driver = {
 		.name = DRIVER_NAME,
 		.name = DRIVER_NAME,
 		.owner = THIS_MODULE,
 		.owner = THIS_MODULE,
-#ifdef CONFIG_PM
 		.pm     = &spi_sirfsoc_pm_ops,
 		.pm     = &spi_sirfsoc_pm_ops,
-#endif
 		.of_match_table = spi_sirfsoc_of_match,
 		.of_match_table = spi_sirfsoc_of_match,
 	},
 	},
 	.probe = spi_sirfsoc_probe,
 	.probe = spi_sirfsoc_probe,