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

Input: sh-keysc - 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 ifdef guards.
Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Link: https://lore.kernel.org/r/20221204180841.2211588-23-jic23@kernel.orgSigned-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 9254ed3f
...@@ -283,7 +283,6 @@ static int sh_keysc_remove(struct platform_device *pdev) ...@@ -283,7 +283,6 @@ static int sh_keysc_remove(struct platform_device *pdev)
return 0; return 0;
} }
#ifdef CONFIG_PM_SLEEP
static int sh_keysc_suspend(struct device *dev) static int sh_keysc_suspend(struct device *dev)
{ {
struct platform_device *pdev = to_platform_device(dev); struct platform_device *pdev = to_platform_device(dev);
...@@ -316,9 +315,8 @@ static int sh_keysc_resume(struct device *dev) ...@@ -316,9 +315,8 @@ static int sh_keysc_resume(struct device *dev)
return 0; return 0;
} }
#endif
static SIMPLE_DEV_PM_OPS(sh_keysc_dev_pm_ops, static DEFINE_SIMPLE_DEV_PM_OPS(sh_keysc_dev_pm_ops,
sh_keysc_suspend, sh_keysc_resume); sh_keysc_suspend, sh_keysc_resume);
static struct platform_driver sh_keysc_device_driver = { static struct platform_driver sh_keysc_device_driver = {
...@@ -326,7 +324,7 @@ static struct platform_driver sh_keysc_device_driver = { ...@@ -326,7 +324,7 @@ static struct platform_driver sh_keysc_device_driver = {
.remove = sh_keysc_remove, .remove = sh_keysc_remove,
.driver = { .driver = {
.name = "sh_keysc", .name = "sh_keysc",
.pm = &sh_keysc_dev_pm_ops, .pm = pm_sleep_ptr(&sh_keysc_dev_pm_ops),
} }
}; };
module_platform_driver(sh_keysc_device_driver); module_platform_driver(sh_keysc_device_driver);
......
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