Commit fea26099 authored by Jonathan Cameron's avatar Jonathan Cameron Committed by Dmitry Torokhov

Input: wm97xx - switch to DEFINE_SIMPLE_DEV_PM_OPS() and pm_sleep_ptr()

SIMPLE_DEV_PM_OPS() is deprecated as it requires explicit protection
against unused function warnings.  The new combination of pm_sleep_ptr()
and DEFINE_SIMPLE_DEV_PM_OPS() allows the compiler to see the functions,
thus suppressing the warning, but still allowing the unused code to be
removed. Thus also drop the __maybe_unused markings.
Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/20230102181842.718010-67-jic23@kernel.orgSigned-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent fa8d5a6e
...@@ -763,7 +763,7 @@ static int wm97xx_mfd_remove(struct platform_device *pdev) ...@@ -763,7 +763,7 @@ static int wm97xx_mfd_remove(struct platform_device *pdev)
return 0; return 0;
} }
static int __maybe_unused wm97xx_suspend(struct device *dev) static int wm97xx_suspend(struct device *dev)
{ {
struct wm97xx *wm = dev_get_drvdata(dev); struct wm97xx *wm = dev_get_drvdata(dev);
u16 reg; u16 reg;
...@@ -797,7 +797,7 @@ static int __maybe_unused wm97xx_suspend(struct device *dev) ...@@ -797,7 +797,7 @@ static int __maybe_unused wm97xx_suspend(struct device *dev)
return 0; return 0;
} }
static int __maybe_unused wm97xx_resume(struct device *dev) static int wm97xx_resume(struct device *dev)
{ {
struct wm97xx *wm = dev_get_drvdata(dev); struct wm97xx *wm = dev_get_drvdata(dev);
...@@ -833,7 +833,7 @@ static int __maybe_unused wm97xx_resume(struct device *dev) ...@@ -833,7 +833,7 @@ static int __maybe_unused wm97xx_resume(struct device *dev)
return 0; return 0;
} }
static SIMPLE_DEV_PM_OPS(wm97xx_pm_ops, wm97xx_suspend, wm97xx_resume); static DEFINE_SIMPLE_DEV_PM_OPS(wm97xx_pm_ops, wm97xx_suspend, wm97xx_resume);
/* /*
* Machine specific operations * Machine specific operations
...@@ -869,13 +869,13 @@ static struct device_driver wm97xx_driver = { ...@@ -869,13 +869,13 @@ static struct device_driver wm97xx_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.probe = wm97xx_probe, .probe = wm97xx_probe,
.remove = wm97xx_remove, .remove = wm97xx_remove,
.pm = &wm97xx_pm_ops, .pm = pm_sleep_ptr(&wm97xx_pm_ops),
}; };
static struct platform_driver wm97xx_mfd_driver = { static struct platform_driver wm97xx_mfd_driver = {
.driver = { .driver = {
.name = "wm97xx-ts", .name = "wm97xx-ts",
.pm = &wm97xx_pm_ops, .pm = pm_sleep_ptr(&wm97xx_pm_ops),
}, },
.probe = wm97xx_mfd_probe, .probe = wm97xx_mfd_probe,
.remove = wm97xx_mfd_remove, .remove = wm97xx_mfd_remove,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment