summaryrefslogtreecommitdiffstats
path: root/drivers/mfd
diff options
context:
space:
mode:
authorPaul Cercueil <paul@crapouillou.net>2022-10-23 10:48:44 +0100
committerLee Jones <lee@kernel.org>2022-12-07 13:28:12 +0000
commit8a8d0485f579120f464193efd8a1ebc96b32fc8b (patch)
treee6e67b90603ddf4d9f8035cfca69136acd3568c0 /drivers/mfd
parent50d3ac7d3ce472801c4c0b3f8705b943657a6552 (diff)
downloadlinux-stable-8a8d0485f579120f464193efd8a1ebc96b32fc8b.tar.gz
linux-stable-8a8d0485f579120f464193efd8a1ebc96b32fc8b.tar.bz2
linux-stable-8a8d0485f579120f464193efd8a1ebc96b32fc8b.zip
mfd: max14577: 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> Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Signed-off-by: Lee Jones <lee@kernel.org>
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/max14577.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/mfd/max14577.c b/drivers/mfd/max14577.c
index 11211039ed90..c59822637338 100644
--- a/drivers/mfd/max14577.c
+++ b/drivers/mfd/max14577.c
@@ -480,7 +480,6 @@ static const struct i2c_device_id max14577_i2c_id[] = {
};
MODULE_DEVICE_TABLE(i2c, max14577_i2c_id);
-#ifdef CONFIG_PM_SLEEP
static int max14577_suspend(struct device *dev)
{
struct i2c_client *i2c = to_i2c_client(dev);
@@ -513,14 +512,13 @@ static int max14577_resume(struct device *dev)
return 0;
}
-#endif /* CONFIG_PM_SLEEP */
-static SIMPLE_DEV_PM_OPS(max14577_pm, max14577_suspend, max14577_resume);
+static DEFINE_SIMPLE_DEV_PM_OPS(max14577_pm, max14577_suspend, max14577_resume);
static struct i2c_driver max14577_i2c_driver = {
.driver = {
.name = "max14577",
- .pm = &max14577_pm,
+ .pm = pm_sleep_ptr(&max14577_pm),
.of_match_table = max14577_dt_match,
},
.probe_new = max14577_i2c_probe,