diff options
| author | Qipan Li <Qipan.Li@csr.com> | 2014-02-13 00:30:20 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-02-24 11:01:14 +0900 |
| commit | facffed29709313593e6feab3a08d9664874e977 (patch) | |
| tree | ebc05addbdd8074816344ef177add17f8c00ab15 | |
| parent | dd7243d6a5de6faaef30cebc554ce8b39d5a3de5 (diff) | |
| download | linux-stable-facffed29709313593e6feab3a08d9664874e977.tar.gz linux-stable-facffed29709313593e6feab3a08d9664874e977.tar.bz2 linux-stable-facffed29709313593e6feab3a08d9664874e977.zip | |
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>
| -rw-r--r-- | drivers/spi/spi-sirf.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/spi/spi-sirf.c b/drivers/spi/spi-sirf.c index 61e5eafac92c..5210b94729aa 100644 --- a/drivers/spi/spi-sirf.c +++ b/drivers/spi/spi-sirf.c @@ -693,7 +693,7 @@ static int spi_sirfsoc_remove(struct platform_device *pdev) return 0; } -#ifdef CONFIG_PM +#ifdef CONFIG_PM_SLEEP static int spi_sirfsoc_suspend(struct device *dev) { struct spi_master *master = dev_get_drvdata(dev); @@ -716,12 +716,11 @@ static int spi_sirfsoc_resume(struct device *dev) return 0; } +#endif 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[] = { { .compatible = "sirf,prima2-spi", }, @@ -734,9 +733,7 @@ static struct platform_driver spi_sirfsoc_driver = { .driver = { .name = DRIVER_NAME, .owner = THIS_MODULE, -#ifdef CONFIG_PM .pm = &spi_sirfsoc_pm_ops, -#endif .of_match_table = spi_sirfsoc_of_match, }, .probe = spi_sirfsoc_probe, |