mfd: stmpe: Remove #ifdef guards for PM related functions

Use the new EXPORT_GPL_SIMPLE_DEV_PM_OPS() and pm_sleep_ptr() macros
to handle the .suspend/.resume callbacks.

These macros allow the suspend and resume functions to be automatically
dropped by the compiler when CONFIG_SUSPEND is disabled, without having
to use #ifdef guards.

This has the advantage of always compiling these functions in,
independently of any Kconfig option. Thanks to that, bugs and other
regressions are subsequently easier to catch.

Signed-off-by: Paul Cercueil <paul@crapouillou.net>
Signed-off-by: Lee Jones <lee@kernel.org>

diff --git a/drivers/mfd/stmpe-i2c.c b/drivers/mfd/stmpe-i2c.c
index 624e3d421b9fcaa0b56d52532fb508af3b383599..d4944fc1feb18ed7b61a637fe8c268c9bda5c156 100644 (file)
--- a/drivers/mfd/stmpe-i2c.c
+++ b/drivers/mfd/stmpe-i2c.c
@@ -115,9 +115,7 @@ MODULE_DEVICE_TABLE(i2c, stmpe_i2c_id);
 static struct i2c_driver stmpe_i2c_driver = {
        .driver = {
                .name = "stmpe-i2c",
-#ifdef CONFIG_PM
-               .pm = &stmpe_dev_pm_ops,
-#endif
+               .pm = pm_sleep_ptr(&stmpe_dev_pm_ops),
                .of_match_table = stmpe_of_match,
        },
        .probe_new      = stmpe_i2c_probe,

diff --git a/drivers/mfd/stmpe-spi.c b/drivers/mfd/stmpe-spi.c
index ad8055a0e28692b6de70c96211e55e46924a4c2c..e9cbf33502b3d4297158feed890f0a68bb0b5999 100644 (file)
--- a/drivers/mfd/stmpe-spi.c
+++ b/drivers/mfd/stmpe-spi.c
@@ -135,9 +135,7 @@ static struct spi_driver stmpe_spi_driver = {
        .driver = {
                .name   = "stmpe-spi",
                .of_match_table = of_match_ptr(stmpe_spi_of_match),
-#ifdef CONFIG_PM
-               .pm     = &stmpe_dev_pm_ops,
-#endif
+               .pm     = pm_sleep_ptr(&stmpe_dev_pm_ops),
        },
        .probe          = stmpe_spi_probe,
        .remove         = stmpe_spi_remove,

diff --git a/drivers/mfd/stmpe.c b/drivers/mfd/stmpe.c
index 0c4f74197d3e04c6befbef757b66d81db9ff72c9..c304d20bb988a2c72b16f71f90fece9aa6a85512 100644 (file)
--- a/drivers/mfd/stmpe.c
+++ b/drivers/mfd/stmpe.c
@@ -1495,7 +1495,6 @@ void stmpe_remove(struct stmpe *stmpe)
        mfd_remove_devices(stmpe->dev);
 }
 
-#ifdef CONFIG_PM
 static int stmpe_suspend(struct device *dev)
 {
        struct stmpe *stmpe = dev_get_drvdata(dev);
@@ -1516,8 +1515,5 @@ static int stmpe_resume(struct device *dev)
        return 0;
 }
 
-const struct dev_pm_ops stmpe_dev_pm_ops = {
-       .suspend        = stmpe_suspend,
-       .resume         = stmpe_resume,
-};
-#endif
+EXPORT_GPL_SIMPLE_DEV_PM_OPS(stmpe_dev_pm_ops,
+                            stmpe_suspend, stmpe_resume);