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

Input: mcs-touchkey - 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-18-jic23@kernel.org
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
Jonathan Cameron 2022-12-04 18:08:26 +00:00 committed by Dmitry Torokhov
parent b94615650f
commit 6b94d7b649
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/mcs_touchkey.c
View File

@ -213,7 +213,6 @@ static void mcs_touchkey_shutdown(struct i2c_client *client)
data->poweron(false); data->poweron(false);
} }
#ifdef CONFIG_PM_SLEEP
static int mcs_touchkey_suspend(struct device *dev) static int mcs_touchkey_suspend(struct device *dev)
{ {
struct mcs_touchkey_data *data = dev_get_drvdata(dev); struct mcs_touchkey_data *data = dev_get_drvdata(dev);
@ -243,10 +242,9 @@ static int mcs_touchkey_resume(struct device *dev)
return 0; return 0;
} }
#endif
static SIMPLE_DEV_PM_OPS(mcs_touchkey_pm_ops, static DEFINE_SIMPLE_DEV_PM_OPS(mcs_touchkey_pm_ops,
mcs_touchkey_suspend, mcs_touchkey_resume); mcs_touchkey_suspend, mcs_touchkey_resume);
static const struct i2c_device_id mcs_touchkey_id[] = { static const struct i2c_device_id mcs_touchkey_id[] = {
{ "mcs5000_touchkey", MCS5000_TOUCHKEY }, { "mcs5000_touchkey", MCS5000_TOUCHKEY },
@ -258,7 +256,7 @@ MODULE_DEVICE_TABLE(i2c, mcs_touchkey_id);
static struct i2c_driver mcs_touchkey_driver = { static struct i2c_driver mcs_touchkey_driver = {
.driver = { .driver = {
.name = "mcs_touchkey", .name = "mcs_touchkey",
.pm = &mcs_touchkey_pm_ops, .pm = pm_sleep_ptr(&mcs_touchkey_pm_ops),
}, },
.probe_new = mcs_touchkey_probe, .probe_new = mcs_touchkey_probe,
.remove = mcs_touchkey_remove, .remove = mcs_touchkey_remove,