Commit bf7aa12b authored by Jonathan Cameron's avatar Jonathan Cameron Committed by Dmitry Torokhov

Input: tca6416-keypad - 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: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Link: https://lore.kernel.org/r/20221204180841.2211588-26-jic23@kernel.orgSigned-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent eeeeb51b
...@@ -320,7 +320,6 @@ static void tca6416_keypad_remove(struct i2c_client *client) ...@@ -320,7 +320,6 @@ static void tca6416_keypad_remove(struct i2c_client *client)
kfree(chip); kfree(chip);
} }
#ifdef CONFIG_PM_SLEEP
static int tca6416_keypad_suspend(struct device *dev) static int tca6416_keypad_suspend(struct device *dev)
{ {
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
...@@ -342,15 +341,14 @@ static int tca6416_keypad_resume(struct device *dev) ...@@ -342,15 +341,14 @@ static int tca6416_keypad_resume(struct device *dev)
return 0; return 0;
} }
#endif
static SIMPLE_DEV_PM_OPS(tca6416_keypad_dev_pm_ops, static DEFINE_SIMPLE_DEV_PM_OPS(tca6416_keypad_dev_pm_ops,
tca6416_keypad_suspend, tca6416_keypad_resume); tca6416_keypad_suspend, tca6416_keypad_resume);
static struct i2c_driver tca6416_keypad_driver = { static struct i2c_driver tca6416_keypad_driver = {
.driver = { .driver = {
.name = "tca6416-keypad", .name = "tca6416-keypad",
.pm = &tca6416_keypad_dev_pm_ops, .pm = pm_sleep_ptr(&tca6416_keypad_dev_pm_ops),
}, },
.probe_new = tca6416_keypad_probe, .probe_new = tca6416_keypad_probe,
.remove = tca6416_keypad_remove, .remove = tca6416_keypad_remove,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment