Input: st-keyscan - 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: Jonathan Cameron <Jonathan.Cameron@huawei.com> Link: https://lore.kernel.org/r/20221204180841.2211588-24-jic23@kernel.org Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
committed by
Dmitry Torokhov
parent
aebc2380c1
commit
a473a763f4
@@ -212,7 +212,6 @@ static int keyscan_probe(struct platform_device *pdev)
|
||||
return 0;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PM_SLEEP
|
||||
static int keyscan_suspend(struct device *dev)
|
||||
{
|
||||
struct platform_device *pdev = to_platform_device(dev);
|
||||
@@ -247,9 +246,9 @@ static int keyscan_resume(struct device *dev)
|
||||
mutex_unlock(&input->mutex);
|
||||
return retval;
|
||||
}
|
||||
#endif
|
||||
|
||||
static SIMPLE_DEV_PM_OPS(keyscan_dev_pm_ops, keyscan_suspend, keyscan_resume);
|
||||
static DEFINE_SIMPLE_DEV_PM_OPS(keyscan_dev_pm_ops,
|
||||
keyscan_suspend, keyscan_resume);
|
||||
|
||||
static const struct of_device_id keyscan_of_match[] = {
|
||||
{ .compatible = "st,sti-keyscan" },
|
||||
@@ -261,7 +260,7 @@ static struct platform_driver keyscan_device_driver = {
|
||||
.probe = keyscan_probe,
|
||||
.driver = {
|
||||
.name = "st-keyscan",
|
||||
.pm = &keyscan_dev_pm_ops,
|
||||
.pm = pm_sleep_ptr(&keyscan_dev_pm_ops),
|
||||
.of_match_table = of_match_ptr(keyscan_of_match),
|
||||
}
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user