Input: ilitek_ts_i2c - 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>
Cc: Joe Hung <joe_hung@ilitek.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/20230102181842.718010-49-jic23@kernel.org
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
Jonathan Cameron 2023-01-02 18:18:21 +00:00 committed by Dmitry Torokhov
parent 311fd6b03c
commit 4024f8481a

View File

@ -604,7 +604,7 @@ static int ilitek_ts_i2c_probe(struct i2c_client *client)
return 0; return 0;
} }
static int __maybe_unused ilitek_suspend(struct device *dev) static int ilitek_suspend(struct device *dev)
{ {
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
struct ilitek_ts_data *ts = i2c_get_clientdata(client); struct ilitek_ts_data *ts = i2c_get_clientdata(client);
@ -621,7 +621,7 @@ static int __maybe_unused ilitek_suspend(struct device *dev)
return 0; return 0;
} }
static int __maybe_unused ilitek_resume(struct device *dev) static int ilitek_resume(struct device *dev)
{ {
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
struct ilitek_ts_data *ts = i2c_get_clientdata(client); struct ilitek_ts_data *ts = i2c_get_clientdata(client);
@ -640,7 +640,7 @@ static int __maybe_unused ilitek_resume(struct device *dev)
return 0; return 0;
} }
static SIMPLE_DEV_PM_OPS(ilitek_pm_ops, ilitek_suspend, ilitek_resume); static DEFINE_SIMPLE_DEV_PM_OPS(ilitek_pm_ops, ilitek_suspend, ilitek_resume);
static const struct i2c_device_id ilitek_ts_i2c_id[] = { static const struct i2c_device_id ilitek_ts_i2c_id[] = {
{ ILITEK_TS_NAME, 0 }, { ILITEK_TS_NAME, 0 },
@ -675,7 +675,7 @@ MODULE_DEVICE_TABLE(of, ilitek_ts_i2c_match);
static struct i2c_driver ilitek_ts_i2c_driver = { static struct i2c_driver ilitek_ts_i2c_driver = {
.driver = { .driver = {
.name = ILITEK_TS_NAME, .name = ILITEK_TS_NAME,
.pm = &ilitek_pm_ops, .pm = pm_sleep_ptr(&ilitek_pm_ops),
.of_match_table = of_match_ptr(ilitek_ts_i2c_match), .of_match_table = of_match_ptr(ilitek_ts_i2c_match),
.acpi_match_table = ACPI_PTR(ilitekts_acpi_id), .acpi_match_table = ACPI_PTR(ilitekts_acpi_id),
}, },