mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

mfd: mcp-sa11x0: Remove #ifdef guards for PM related functions 

Use the new pm_sleep_ptr() macro to handle the .suspend/.resume
callbacks.

This macro 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>
Signed-off-by: Lee Jones <lee@kernel.org>
This commit is contained in:
Paul Cercueil 2022-10-23 10:48:35 +01:00 committed by Lee Jones
parent fdefee3073
commit ff84723e52
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/mfd/mcp-sa11x0.c
View File

@ -255,7 +255,6 @@ static int mcp_sa11x0_remove(struct platform_device *dev)
return 0; return 0;
} }
#ifdef CONFIG_PM_SLEEP
static int mcp_sa11x0_suspend(struct device *dev) static int mcp_sa11x0_suspend(struct device *dev)
{ {
struct mcp_sa11x0 *m = priv(dev_get_drvdata(dev)); struct mcp_sa11x0 *m = priv(dev_get_drvdata(dev));
@ -277,17 +276,14 @@ static int mcp_sa11x0_resume(struct device *dev)
return 0; return 0;
} }
#endif
static const struct dev_pm_ops mcp_sa11x0_pm_ops = { static const struct dev_pm_ops mcp_sa11x0_pm_ops = {
#ifdef CONFIG_PM_SLEEP
.suspend = mcp_sa11x0_suspend, .suspend = mcp_sa11x0_suspend,
.freeze = mcp_sa11x0_suspend, .freeze = mcp_sa11x0_suspend,
.poweroff = mcp_sa11x0_suspend, .poweroff = mcp_sa11x0_suspend,
.resume_noirq = mcp_sa11x0_resume, .resume_noirq = mcp_sa11x0_resume,
.thaw_noirq = mcp_sa11x0_resume, .thaw_noirq = mcp_sa11x0_resume,
.restore_noirq = mcp_sa11x0_resume, .restore_noirq = mcp_sa11x0_resume,
#endif
}; };
static struct platform_driver mcp_sa11x0_driver = { static struct platform_driver mcp_sa11x0_driver = {
@ -295,7 +291,7 @@ static struct platform_driver mcp_sa11x0_driver = {
.remove = mcp_sa11x0_remove, .remove = mcp_sa11x0_remove,
.driver = { .driver = {
.name = DRIVER_NAME, .name = DRIVER_NAME,
.pm = &mcp_sa11x0_pm_ops, .pm = pm_sleep_ptr(&mcp_sa11x0_pm_ops),
}, },
}; };