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

Input: cypress-sf - 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>
Link: https://lore.kernel.org/r/20221204180841.2211588-5-jic23@kernel.org
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
Jonathan Cameron 2022-12-04 18:08:13 +00:00 committed by Dmitry Torokhov
parent ca219cf7fd
commit fbfb262e0a
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/input/keyboard/cypress-sf.c
View File

@ -168,7 +168,7 @@ static int cypress_sf_probe(struct i2c_client *client)
return 0; return 0;
}; };
static int __maybe_unused cypress_sf_suspend(struct device *dev) static int cypress_sf_suspend(struct device *dev)
{ {
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
struct cypress_sf_data *touchkey = i2c_get_clientdata(client); struct cypress_sf_data *touchkey = i2c_get_clientdata(client);
@ -187,7 +187,7 @@ static int __maybe_unused cypress_sf_suspend(struct device *dev)
return 0; return 0;
} }
static int __maybe_unused cypress_sf_resume(struct device *dev) static int cypress_sf_resume(struct device *dev)
{ {
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
struct cypress_sf_data *touchkey = i2c_get_clientdata(client); struct cypress_sf_data *touchkey = i2c_get_clientdata(client);
@ -205,8 +205,8 @@ static int __maybe_unused cypress_sf_resume(struct device *dev)
return 0; return 0;
} }
static SIMPLE_DEV_PM_OPS(cypress_sf_pm_ops, static DEFINE_SIMPLE_DEV_PM_OPS(cypress_sf_pm_ops,
cypress_sf_suspend, cypress_sf_resume); cypress_sf_suspend, cypress_sf_resume);
static struct i2c_device_id cypress_sf_id_table[] = { static struct i2c_device_id cypress_sf_id_table[] = {
{ CYPRESS_SF_DEV_NAME, 0 }, { CYPRESS_SF_DEV_NAME, 0 },
@ -225,7 +225,7 @@ MODULE_DEVICE_TABLE(of, cypress_sf_of_match);
static struct i2c_driver cypress_sf_driver = { static struct i2c_driver cypress_sf_driver = {
.driver = { .driver = {
.name = CYPRESS_SF_DEV_NAME, .name = CYPRESS_SF_DEV_NAME,
.pm = &cypress_sf_pm_ops, .pm = pm_sleep_ptr(&cypress_sf_pm_ops),
.of_match_table = of_match_ptr(cypress_sf_of_match), .of_match_table = of_match_ptr(cypress_sf_of_match),
}, },
.id_table = cypress_sf_id_table, .id_table = cypress_sf_id_table,