UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Input: ambakmi - 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-30-jic23@kernel.org
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
Jonathan Cameron 2023-01-02 18:18:02 +00:00 committed by Dmitry Torokhov
parent 18b8fe43d5
commit 9c19131f6b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/input/serio/ambakmi.c
View File

@ -170,7 +170,7 @@ static void amba_kmi_remove(struct amba_device *dev)
amba_release_regions(dev); amba_release_regions(dev);
} }
static int __maybe_unused amba_kmi_resume(struct device *dev) static int amba_kmi_resume(struct device *dev)
{ {
struct amba_kmi_port *kmi = dev_get_drvdata(dev); struct amba_kmi_port *kmi = dev_get_drvdata(dev);
@ -180,7 +180,7 @@ static int __maybe_unused amba_kmi_resume(struct device *dev)
return 0; return 0;
} }
static SIMPLE_DEV_PM_OPS(amba_kmi_dev_pm_ops, NULL, amba_kmi_resume); static DEFINE_SIMPLE_DEV_PM_OPS(amba_kmi_dev_pm_ops, NULL, amba_kmi_resume);
static const struct amba_id amba_kmi_idtable[] = { static const struct amba_id amba_kmi_idtable[] = {
{ {
@ -196,7 +196,7 @@ static struct amba_driver ambakmi_driver = {
.drv = { .drv = {
.name = "kmi-pl050", .name = "kmi-pl050",
.owner = THIS_MODULE, .owner = THIS_MODULE,
.pm = &amba_kmi_dev_pm_ops, .pm = pm_sleep_ptr(&amba_kmi_dev_pm_ops),
}, },
.id_table = amba_kmi_idtable, .id_table = amba_kmi_idtable,
.probe = amba_kmi_probe, .probe = amba_kmi_probe,