Input: ucb1400_ts - 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: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/20230102181842.718010-64-jic23@kernel.org
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
Jonathan Cameron 2023-01-02 18:18:36 +00:00 committed by Dmitry Torokhov
parent f840164347
commit 2cfa7c9c55

View file

@ -401,7 +401,7 @@ static int ucb1400_ts_remove(struct platform_device *pdev)
return 0;
}
static int __maybe_unused ucb1400_ts_suspend(struct device *dev)
static int ucb1400_ts_suspend(struct device *dev)
{
struct ucb1400_ts *ucb = dev_get_platdata(dev);
struct input_dev *idev = ucb->ts_idev;
@ -415,7 +415,7 @@ static int __maybe_unused ucb1400_ts_suspend(struct device *dev)
return 0;
}
static int __maybe_unused ucb1400_ts_resume(struct device *dev)
static int ucb1400_ts_resume(struct device *dev)
{
struct ucb1400_ts *ucb = dev_get_platdata(dev);
struct input_dev *idev = ucb->ts_idev;
@ -429,15 +429,15 @@ static int __maybe_unused ucb1400_ts_resume(struct device *dev)
return 0;
}
static SIMPLE_DEV_PM_OPS(ucb1400_ts_pm_ops,
ucb1400_ts_suspend, ucb1400_ts_resume);
static DEFINE_SIMPLE_DEV_PM_OPS(ucb1400_ts_pm_ops,
ucb1400_ts_suspend, ucb1400_ts_resume);
static struct platform_driver ucb1400_ts_driver = {
.probe = ucb1400_ts_probe,
.remove = ucb1400_ts_remove,
.driver = {
.name = "ucb1400_ts",
.pm = &ucb1400_ts_pm_ops,
.pm = pm_sleep_ptr(&ucb1400_ts_pm_ops),
},
};
module_platform_driver(ucb1400_ts_driver);