| Message ID | 20230102181842.718010-45-jic23@kernel.org |
|---|---|
| State | New |
| Headers | show |
| Series | Input: Switch to DEFINE_SIMPLE_DEV_PM_OP() set 2 | expand |
Hi, On 1/2/23 19:18, Jonathan Cameron wrote: > From: Jonathan Cameron <Jonathan.Cameron@huawei.com> > > 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: Jonathan Neuschäfer <j.neuschaefer@gmx.net> > Cc: Hans de Goede <hdegoede@redhat.com> Thanks, patch looks good to me: Reviewed-by: Hans de Goede <hdegoede@redhat.com> Regards, Hans > --- > drivers/input/touchscreen/ektf2127.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/drivers/input/touchscreen/ektf2127.c b/drivers/input/touchscreen/ektf2127.c > index 328841eaa1b7..e6f1e46d003d 100644 > --- a/drivers/input/touchscreen/ektf2127.c > +++ b/drivers/input/touchscreen/ektf2127.c > @@ -177,7 +177,7 @@ static void ektf2127_stop(struct input_dev *dev) > gpiod_set_value_cansleep(ts->power_gpios, 0); > } > > -static int __maybe_unused ektf2127_suspend(struct device *dev) > +static int ektf2127_suspend(struct device *dev) > { > struct ektf2127_ts *ts = i2c_get_clientdata(to_i2c_client(dev)); > > @@ -189,7 +189,7 @@ static int __maybe_unused ektf2127_suspend(struct device *dev) > return 0; > } > > -static int __maybe_unused ektf2127_resume(struct device *dev) > +static int ektf2127_resume(struct device *dev) > { > struct ektf2127_ts *ts = i2c_get_clientdata(to_i2c_client(dev)); > > @@ -201,8 +201,8 @@ static int __maybe_unused ektf2127_resume(struct device *dev) > return 0; > } > > -static SIMPLE_DEV_PM_OPS(ektf2127_pm_ops, ektf2127_suspend, > - ektf2127_resume); > +static DEFINE_SIMPLE_DEV_PM_OPS(ektf2127_pm_ops, ektf2127_suspend, > + ektf2127_resume); > > static int ektf2127_query_dimension(struct i2c_client *client, bool width) > { > @@ -348,7 +348,7 @@ MODULE_DEVICE_TABLE(i2c, ektf2127_i2c_id); > static struct i2c_driver ektf2127_driver = { > .driver = { > .name = "elan_ektf2127", > - .pm = &ektf2127_pm_ops, > + .pm = pm_sleep_ptr(&ektf2127_pm_ops), > .of_match_table = of_match_ptr(ektf2127_of_match), > }, > .probe_new = ektf2127_probe,
diff --git a/drivers/input/touchscreen/ektf2127.c b/drivers/input/touchscreen/ektf2127.c index 328841eaa1b7..e6f1e46d003d 100644 --- a/drivers/input/touchscreen/ektf2127.c +++ b/drivers/input/touchscreen/ektf2127.c @@ -177,7 +177,7 @@ static void ektf2127_stop(struct input_dev *dev) gpiod_set_value_cansleep(ts->power_gpios, 0); } -static int __maybe_unused ektf2127_suspend(struct device *dev) +static int ektf2127_suspend(struct device *dev) { struct ektf2127_ts *ts = i2c_get_clientdata(to_i2c_client(dev)); @@ -189,7 +189,7 @@ static int __maybe_unused ektf2127_suspend(struct device *dev) return 0; } -static int __maybe_unused ektf2127_resume(struct device *dev) +static int ektf2127_resume(struct device *dev) { struct ektf2127_ts *ts = i2c_get_clientdata(to_i2c_client(dev)); @@ -201,8 +201,8 @@ static int __maybe_unused ektf2127_resume(struct device *dev) return 0; } -static SIMPLE_DEV_PM_OPS(ektf2127_pm_ops, ektf2127_suspend, - ektf2127_resume); +static DEFINE_SIMPLE_DEV_PM_OPS(ektf2127_pm_ops, ektf2127_suspend, + ektf2127_resume); static int ektf2127_query_dimension(struct i2c_client *client, bool width) { @@ -348,7 +348,7 @@ MODULE_DEVICE_TABLE(i2c, ektf2127_i2c_id); static struct i2c_driver ektf2127_driver = { .driver = { .name = "elan_ektf2127", - .pm = &ektf2127_pm_ops, + .pm = pm_sleep_ptr(&ektf2127_pm_ops), .of_match_table = of_match_ptr(ektf2127_of_match), }, .probe_new = ektf2127_probe,