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

Use the new DEFINE_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/max77620.c b/drivers/mfd/max77620.c
index 0b1e9340210b50b6e696212ab113a3772ec7ca7a..cbd2297126f041756b3e04235c6067fa13837b18 100644 (file)
--- a/drivers/mfd/max77620.c
+++ b/drivers/mfd/max77620.c
@@ -576,7 +576,6 @@ static int max77620_probe(struct i2c_client *client)
        return 0;
 }
 
-#ifdef CONFIG_PM_SLEEP
 static int max77620_set_fps_period(struct max77620_chip *chip,
                                   int fps_id, int time_period)
 {
@@ -683,7 +682,6 @@ out:
 
        return 0;
 }
-#endif
 
 static const struct i2c_device_id max77620_id[] = {
        {"max77620", MAX77620},
@@ -692,14 +690,13 @@ static const struct i2c_device_id max77620_id[] = {
        {},
 };
 
-static const struct dev_pm_ops max77620_pm_ops = {
-       SET_SYSTEM_SLEEP_PM_OPS(max77620_i2c_suspend, max77620_i2c_resume)
-};
+static DEFINE_SIMPLE_DEV_PM_OPS(max77620_pm_ops,
+                               max77620_i2c_suspend, max77620_i2c_resume);
 
 static struct i2c_driver max77620_driver = {
        .driver = {
                .name = "max77620",
-               .pm = &max77620_pm_ops,
+               .pm = pm_sleep_ptr(&max77620_pm_ops),
        },
        .probe_new = max77620_probe,
        .id_table = max77620_id,