Commit fdefee30 authored by Paul Cercueil's avatar Paul Cercueil Committed by Lee Jones

mfd: 88pm860x: 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: default avatarPaul Cercueil <paul@crapouillou.net>
Signed-off-by: default avatarLee Jones <lee@kernel.org>
parent 03bf96cf
...@@ -1212,7 +1212,6 @@ static void pm860x_remove(struct i2c_client *client) ...@@ -1212,7 +1212,6 @@ static void pm860x_remove(struct i2c_client *client)
} }
} }
#ifdef CONFIG_PM_SLEEP
static int pm860x_suspend(struct device *dev) static int pm860x_suspend(struct device *dev)
{ {
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
...@@ -1232,9 +1231,8 @@ static int pm860x_resume(struct device *dev) ...@@ -1232,9 +1231,8 @@ static int pm860x_resume(struct device *dev)
disable_irq_wake(chip->core_irq); disable_irq_wake(chip->core_irq);
return 0; return 0;
} }
#endif
static SIMPLE_DEV_PM_OPS(pm860x_pm_ops, pm860x_suspend, pm860x_resume); static DEFINE_SIMPLE_DEV_PM_OPS(pm860x_pm_ops, pm860x_suspend, pm860x_resume);
static const struct i2c_device_id pm860x_id_table[] = { static const struct i2c_device_id pm860x_id_table[] = {
{ "88PM860x", 0 }, { "88PM860x", 0 },
...@@ -1251,7 +1249,7 @@ MODULE_DEVICE_TABLE(of, pm860x_dt_ids); ...@@ -1251,7 +1249,7 @@ MODULE_DEVICE_TABLE(of, pm860x_dt_ids);
static struct i2c_driver pm860x_driver = { static struct i2c_driver pm860x_driver = {
.driver = { .driver = {
.name = "88PM860x", .name = "88PM860x",
.pm = &pm860x_pm_ops, .pm = pm_sleep_ptr(&pm860x_pm_ops),
.of_match_table = pm860x_dt_ids, .of_match_table = pm860x_dt_ids,
}, },
.probe_new = pm860x_probe, .probe_new = pm860x_probe,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment