Input: elants_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: Douglas Anderson <dianders@chromium.org> Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Link: https://lore.kernel.org/r/20230102181842.718010-46-jic23@kernel.org Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
committed by
Dmitry Torokhov
parent
717ba04a88
commit
df0f673485
@@ -1572,7 +1572,7 @@ static int elants_i2c_probe(struct i2c_client *client)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int __maybe_unused elants_i2c_suspend(struct device *dev)
|
||||
static int elants_i2c_suspend(struct device *dev)
|
||||
{
|
||||
struct i2c_client *client = to_i2c_client(dev);
|
||||
struct elants_data *ts = i2c_get_clientdata(client);
|
||||
@@ -1611,7 +1611,7 @@ static int __maybe_unused elants_i2c_suspend(struct device *dev)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int __maybe_unused elants_i2c_resume(struct device *dev)
|
||||
static int elants_i2c_resume(struct device *dev)
|
||||
{
|
||||
struct i2c_client *client = to_i2c_client(dev);
|
||||
struct elants_data *ts = i2c_get_clientdata(client);
|
||||
@@ -1644,8 +1644,8 @@ static int __maybe_unused elants_i2c_resume(struct device *dev)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static SIMPLE_DEV_PM_OPS(elants_i2c_pm_ops,
|
||||
elants_i2c_suspend, elants_i2c_resume);
|
||||
static DEFINE_SIMPLE_DEV_PM_OPS(elants_i2c_pm_ops,
|
||||
elants_i2c_suspend, elants_i2c_resume);
|
||||
|
||||
static const struct i2c_device_id elants_i2c_id[] = {
|
||||
{ DEVICE_NAME, EKTH3500 },
|
||||
@@ -1677,7 +1677,7 @@ static struct i2c_driver elants_i2c_driver = {
|
||||
.id_table = elants_i2c_id,
|
||||
.driver = {
|
||||
.name = DEVICE_NAME,
|
||||
.pm = &elants_i2c_pm_ops,
|
||||
.pm = pm_sleep_ptr(&elants_i2c_pm_ops),
|
||||
.acpi_match_table = ACPI_PTR(elants_acpi_id),
|
||||
.of_match_table = of_match_ptr(elants_of_match),
|
||||
.probe_type = PROBE_PREFER_ASYNCHRONOUS,
|
||||
|
||||
Reference in New Issue
Block a user