mirror of
https://github.com/torvalds/linux
synced 2024-09-06 18:01:05 +00:00
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:
parent
dce97f81fe
commit
5745a90a93
|
@ -305,7 +305,6 @@ static int adp5520_probe(struct i2c_client *client)
|
|||
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,
|
||||
|
|
Loading…
Reference in a new issue