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

Input: cy8ctmg110_ts - 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: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/20230102181842.718010-41-jic23@kernel.orgSigned-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 02998590
...@@ -237,7 +237,7 @@ static int cy8ctmg110_probe(struct i2c_client *client) ...@@ -237,7 +237,7 @@ static int cy8ctmg110_probe(struct i2c_client *client)
return 0; return 0;
} }
static int __maybe_unused cy8ctmg110_suspend(struct device *dev) static int cy8ctmg110_suspend(struct device *dev)
{ {
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
struct cy8ctmg110 *ts = i2c_get_clientdata(client); struct cy8ctmg110 *ts = i2c_get_clientdata(client);
...@@ -250,7 +250,7 @@ static int __maybe_unused cy8ctmg110_suspend(struct device *dev) ...@@ -250,7 +250,7 @@ static int __maybe_unused cy8ctmg110_suspend(struct device *dev)
return 0; return 0;
} }
static int __maybe_unused cy8ctmg110_resume(struct device *dev) static int cy8ctmg110_resume(struct device *dev)
{ {
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
struct cy8ctmg110 *ts = i2c_get_clientdata(client); struct cy8ctmg110 *ts = i2c_get_clientdata(client);
...@@ -263,7 +263,8 @@ static int __maybe_unused cy8ctmg110_resume(struct device *dev) ...@@ -263,7 +263,8 @@ static int __maybe_unused cy8ctmg110_resume(struct device *dev)
return 0; return 0;
} }
static SIMPLE_DEV_PM_OPS(cy8ctmg110_pm, cy8ctmg110_suspend, cy8ctmg110_resume); static DEFINE_SIMPLE_DEV_PM_OPS(cy8ctmg110_pm,
cy8ctmg110_suspend, cy8ctmg110_resume);
static const struct i2c_device_id cy8ctmg110_idtable[] = { static const struct i2c_device_id cy8ctmg110_idtable[] = {
{ CY8CTMG110_DRIVER_NAME, 1 }, { CY8CTMG110_DRIVER_NAME, 1 },
...@@ -275,7 +276,7 @@ MODULE_DEVICE_TABLE(i2c, cy8ctmg110_idtable); ...@@ -275,7 +276,7 @@ MODULE_DEVICE_TABLE(i2c, cy8ctmg110_idtable);
static struct i2c_driver cy8ctmg110_driver = { static struct i2c_driver cy8ctmg110_driver = {
.driver = { .driver = {
.name = CY8CTMG110_DRIVER_NAME, .name = CY8CTMG110_DRIVER_NAME,
.pm = &cy8ctmg110_pm, .pm = pm_sleep_ptr(&cy8ctmg110_pm),
}, },
.id_table = cy8ctmg110_idtable, .id_table = cy8ctmg110_idtable,
.probe_new = cy8ctmg110_probe, .probe_new = cy8ctmg110_probe,
......
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