Input: st1232 - 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: John Keeping <john@metanate.com> Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Link: https://lore.kernel.org/r/20230102181842.718010-61-jic23@kernel.org Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
parent
5a88638218
commit
7c8d436dc9
|
@ -340,7 +340,7 @@ static int st1232_ts_probe(struct i2c_client *client)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int __maybe_unused st1232_ts_suspend(struct device *dev)
|
||||
static int st1232_ts_suspend(struct device *dev)
|
||||
{
|
||||
struct i2c_client *client = to_i2c_client(dev);
|
||||
struct st1232_ts_data *ts = i2c_get_clientdata(client);
|
||||
|
@ -353,7 +353,7 @@ static int __maybe_unused st1232_ts_suspend(struct device *dev)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int __maybe_unused st1232_ts_resume(struct device *dev)
|
||||
static int st1232_ts_resume(struct device *dev)
|
||||
{
|
||||
struct i2c_client *client = to_i2c_client(dev);
|
||||
struct st1232_ts_data *ts = i2c_get_clientdata(client);
|
||||
|
@ -366,8 +366,8 @@ static int __maybe_unused st1232_ts_resume(struct device *dev)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static SIMPLE_DEV_PM_OPS(st1232_ts_pm_ops,
|
||||
st1232_ts_suspend, st1232_ts_resume);
|
||||
static DEFINE_SIMPLE_DEV_PM_OPS(st1232_ts_pm_ops,
|
||||
st1232_ts_suspend, st1232_ts_resume);
|
||||
|
||||
static const struct i2c_device_id st1232_ts_id[] = {
|
||||
{ ST1232_TS_NAME, (unsigned long)&st1232_chip_info },
|
||||
|
@ -390,7 +390,7 @@ static struct i2c_driver st1232_ts_driver = {
|
|||
.name = ST1232_TS_NAME,
|
||||
.of_match_table = st1232_ts_dt_ids,
|
||||
.probe_type = PROBE_PREFER_ASYNCHRONOUS,
|
||||
.pm = &st1232_ts_pm_ops,
|
||||
.pm = pm_sleep_ptr(&st1232_ts_pm_ops),
|
||||
},
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in New Issue