mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-12-29 17:25:38 +00:00
mfd: ucb1x00: 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> Signed-off-by: Lee Jones <lee@kernel.org>
This commit is contained in:
parent
e4b9a17c99
commit
03bf96cf8e
@ -660,7 +660,6 @@ void ucb1x00_unregister_driver(struct ucb1x00_driver *drv)
|
||||
mutex_unlock(&ucb1x00_mutex);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PM_SLEEP
|
||||
static int ucb1x00_suspend(struct device *dev)
|
||||
{
|
||||
struct ucb1x00_plat_data *pdata = dev_get_platdata(dev);
|
||||
@ -728,15 +727,15 @@ static int ucb1x00_resume(struct device *dev)
|
||||
mutex_unlock(&ucb1x00_mutex);
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
static SIMPLE_DEV_PM_OPS(ucb1x00_pm_ops, ucb1x00_suspend, ucb1x00_resume);
|
||||
static DEFINE_SIMPLE_DEV_PM_OPS(ucb1x00_pm_ops,
|
||||
ucb1x00_suspend, ucb1x00_resume);
|
||||
|
||||
static struct mcp_driver ucb1x00_driver = {
|
||||
.drv = {
|
||||
.name = "ucb1x00",
|
||||
.owner = THIS_MODULE,
|
||||
.pm = &ucb1x00_pm_ops,
|
||||
.pm = pm_sleep_ptr(&ucb1x00_pm_ops),
|
||||
},
|
||||
.probe = ucb1x00_probe,
|
||||
.remove = ucb1x00_remove,
|
||||
|
Loading…
Reference in New Issue
Block a user