diff options
| author | Jonathan Cameron <Jonathan.Cameron@huawei.com> | 2022-12-04 19:08:23 +0100 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2022-12-07 22:27:32 +0100 |
| commit | bad0193a069231dfdf9664a60b49f34c232ed58c (patch) | |
| tree | 796f9e269f816dae302433d25383872028d6b9a9 | |
| parent | Input: lm8323 - switch to DEFINE_SIMPLE_DEV_PM_OPS() and pm_sleep_ptr() (diff) | |
| download | linux-bad0193a069231dfdf9664a60b49f34c232ed58c.tar.xz linux-bad0193a069231dfdf9664a60b49f34c232ed58c.zip | |
Input: lpc32xx-keys - 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-15-jic23@kernel.org
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
| -rw-r--r-- | drivers/input/keyboard/lpc32xx-keys.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/input/keyboard/lpc32xx-keys.c b/drivers/input/keyboard/lpc32xx-keys.c index 943aeeb0de79..911e1181cd6f 100644 --- a/drivers/input/keyboard/lpc32xx-keys.c +++ b/drivers/input/keyboard/lpc32xx-keys.c @@ -264,7 +264,6 @@ static int lpc32xx_kscan_probe(struct platform_device *pdev) return 0; } -#ifdef CONFIG_PM_SLEEP static int lpc32xx_kscan_suspend(struct device *dev) { struct platform_device *pdev = to_platform_device(dev); @@ -302,10 +301,9 @@ static int lpc32xx_kscan_resume(struct device *dev) mutex_unlock(&input->mutex); return retval; } -#endif -static SIMPLE_DEV_PM_OPS(lpc32xx_kscan_pm_ops, lpc32xx_kscan_suspend, - lpc32xx_kscan_resume); +static DEFINE_SIMPLE_DEV_PM_OPS(lpc32xx_kscan_pm_ops, lpc32xx_kscan_suspend, + lpc32xx_kscan_resume); static const struct of_device_id lpc32xx_kscan_match[] = { { .compatible = "nxp,lpc3220-key" }, @@ -317,7 +315,7 @@ static struct platform_driver lpc32xx_kscan_driver = { .probe = lpc32xx_kscan_probe, .driver = { .name = DRV_NAME, - .pm = &lpc32xx_kscan_pm_ops, + .pm = pm_sleep_ptr(&lpc32xx_kscan_pm_ops), .of_match_table = lpc32xx_kscan_match, } }; |