diff options
| author | Paul Cercueil <paul@crapouillou.net> | 2022-10-23 12:48:27 +0300 |
|---|---|---|
| committer | Lee Jones <lee@kernel.org> | 2022-12-07 16:28:10 +0300 |
| commit | 5745a90a930c81b55dfcb67b5e904b3cb1df0c7a (patch) | |
| tree | e1ee75994974d301581f982b5bccc378940b336c /drivers/mfd | |
| parent | dce97f81fea6fa6230e6b7f0e2d0f17a74158dc9 (diff) | |
| download | linux-5745a90a930c81b55dfcb67b5e904b3cb1df0c7a.tar.xz | |
mfd: adp5520: 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>
Acked-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Lee Jones <lee@kernel.org>
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/adp5520.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/mfd/adp5520.c b/drivers/mfd/adp5520.c index bdcedb034913..cb168efdbafe 100644 --- a/drivers/mfd/adp5520.c +++ b/drivers/mfd/adp5520.c @@ -305,7 +305,6 @@ out_free_irq: return ret; } -#ifdef CONFIG_PM_SLEEP static int adp5520_suspend(struct device *dev) { struct i2c_client *client = to_i2c_client(dev); @@ -326,9 +325,8 @@ static int adp5520_resume(struct device *dev) adp5520_write(chip->dev, ADP5520_MODE_STATUS, chip->mode); return 0; } -#endif -static SIMPLE_DEV_PM_OPS(adp5520_pm, adp5520_suspend, adp5520_resume); +static DEFINE_SIMPLE_DEV_PM_OPS(adp5520_pm, adp5520_suspend, adp5520_resume); static const struct i2c_device_id adp5520_id[] = { { "pmic-adp5520", ID_ADP5520 }, @@ -339,7 +337,7 @@ static const struct i2c_device_id adp5520_id[] = { static struct i2c_driver adp5520_driver = { .driver = { .name = "adp5520", - .pm = &adp5520_pm, + .pm = pm_sleep_ptr(&adp5520_pm), .suppress_bind_attrs = true, }, .probe_new = adp5520_probe, |