iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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-21-jic23@kernel.org
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
Jonathan Cameron 2022-12-04 18:08:29 +00:00 committed by Dmitry Torokhov
parent bb4678889e
commit a4b4fa5101
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/input/keyboard/pxa27x_keypad.c
View File

@ -660,7 +660,6 @@ static void pxa27x_keypad_close(struct input_dev *dev)
clk_disable_unprepare(keypad->clk); clk_disable_unprepare(keypad->clk);
} }
#ifdef CONFIG_PM_SLEEP
static int pxa27x_keypad_suspend(struct device *dev) static int pxa27x_keypad_suspend(struct device *dev)
{ {
struct platform_device *pdev = to_platform_device(dev); struct platform_device *pdev = to_platform_device(dev);
@ -706,10 +705,9 @@ static int pxa27x_keypad_resume(struct device *dev)
return ret; return ret;
} }
#endif
static SIMPLE_DEV_PM_OPS(pxa27x_keypad_pm_ops, static DEFINE_SIMPLE_DEV_PM_OPS(pxa27x_keypad_pm_ops,
pxa27x_keypad_suspend, pxa27x_keypad_resume); pxa27x_keypad_suspend, pxa27x_keypad_resume);
static int pxa27x_keypad_probe(struct platform_device *pdev) static int pxa27x_keypad_probe(struct platform_device *pdev)
@ -830,7 +828,7 @@ static struct platform_driver pxa27x_keypad_driver = {
.driver = { .driver = {
.name = "pxa27x-keypad", .name = "pxa27x-keypad",
.of_match_table = of_match_ptr(pxa27x_keypad_dt_match), .of_match_table = of_match_ptr(pxa27x_keypad_dt_match),
.pm = &pxa27x_keypad_pm_ops, .pm = pm_sleep_ptr(&pxa27x_keypad_pm_ops),
}, },
}; };
module_platform_driver(pxa27x_keypad_driver); module_platform_driver(pxa27x_keypad_driver);