diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-09-15 17:46:53 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-09-16 16:47:09 +0100 |
| commit | a0319f8b12c0fb9800da61f4cba9bd6fd80e37a4 (patch) | |
| tree | 6e08915ca19cc23b6666726c3c2b7646b877fb0a /drivers/spi | |
| parent | c0a75d072a501effd66d3392ada8d3f4283b87ef (diff) | |
spi: bcm-qspi: fix suspend/resume #ifdef
The two power management functions are define inside of an #ifdef
but referenced unconditionally, which is obviously broken when
CONFIG_PM_SLEEP is not set:
drivers/spi/spi-bcm-qspi.c:1300:13: error: 'bcm_qspi_suspend' undeclared here (not in a function)
drivers/spi/spi-bcm-qspi.c:1301:13: error: 'bcm_qspi_resume' undeclared here (not in a function)
This replaces the #ifdef with a __maybe_unused annotation that lets
the compiler figure out whether to drop the functions itself,
and uses SIMPLE_DEV_PM_OPS() to refer to the functions.
This will also fill the freeze/thaw/poweroff/restore callback
pointers in addition to suspend/resume, but as far as I can tell,
this is what we want.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: fa236a7ef240 ("spi: bcm-qspi: Add Broadcom MSPI driver")
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi-bcm-qspi.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/spi/spi-bcm-qspi.c b/drivers/spi/spi-bcm-qspi.c index 5da182be073e..64e693de1486 100644 --- a/drivers/spi/spi-bcm-qspi.c +++ b/drivers/spi/spi-bcm-qspi.c @@ -1268,8 +1268,7 @@ int bcm_qspi_remove(struct platform_device *pdev) /* function to be called by SoC specific platform driver remove() */ EXPORT_SYMBOL_GPL(bcm_qspi_remove); -#ifdef CONFIG_PM_SLEEP -static int bcm_qspi_suspend(struct device *dev) +static int __maybe_unused bcm_qspi_suspend(struct device *dev) { struct bcm_qspi *qspi = dev_get_drvdata(dev); @@ -1280,7 +1279,7 @@ static int bcm_qspi_suspend(struct device *dev) return 0; }; -static int bcm_qspi_resume(struct device *dev) +static int __maybe_unused bcm_qspi_resume(struct device *dev) { struct bcm_qspi *qspi = dev_get_drvdata(dev); int ret = 0; @@ -1293,12 +1292,9 @@ static int bcm_qspi_resume(struct device *dev) return ret; } -#endif /* CONFIG_PM_SLEEP */ -const struct dev_pm_ops bcm_qspi_pm_ops = { - .suspend = bcm_qspi_suspend, - .resume = bcm_qspi_resume, -}; +SIMPLE_DEV_PM_OPS(bcm_qspi_pm_ops, bcm_qspi_suspend, bcm_qspi_resume); + /* pm_ops to be called by SoC specific platform driver */ EXPORT_SYMBOL_GPL(bcm_qspi_pm_ops); |