OrgACRN
/
acrn-kernel
mirror of https://github.com/projectacrn/acrn-kernel.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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>
This commit is contained in:
Paul Cercueil 2022-10-23 10:48:27 +01:00 committed by Lee Jones
parent dce97f81fe
commit 5745a90a93
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/mfd/adp5520.c
View File

@ -305,7 +305,6 @@ static int adp5520_probe(struct i2c_client *client)
return ret; return ret;
} }
#ifdef CONFIG_PM_SLEEP
static int adp5520_suspend(struct device *dev) static int adp5520_suspend(struct device *dev)
{ {
struct i2c_client *client = to_i2c_client(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); adp5520_write(chip->dev, ADP5520_MODE_STATUS, chip->mode);
return 0; 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[] = { static const struct i2c_device_id adp5520_id[] = {
{ "pmic-adp5520", ID_ADP5520 }, { "pmic-adp5520", ID_ADP5520 },
@ -339,7 +337,7 @@ static const struct i2c_device_id adp5520_id[] = {
static struct i2c_driver adp5520_driver = { static struct i2c_driver adp5520_driver = {
.driver = { .driver = {
.name = "adp5520", .name = "adp5520",
.pm = &adp5520_pm, .pm = pm_sleep_ptr(&adp5520_pm),
.suppress_bind_attrs = true, .suppress_bind_attrs = true,
}, },
.probe_new = adp5520_probe, .probe_new = adp5520_probe,