Input: atmel_mxt_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: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Cc: Nicolas Ferre <nicolas.ferre@microchip.com>
Cc: Alexandre Belloni <alexandre.belloni@bootlin.com>
Cc: Claudiu Beznea <claudiu.beznea@microchip.com>
Reviewed-by: Claudiu Beznea <claudiu.beznea@microchip.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/20230102181842.718010-34-jic23@kernel.org
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
Jonathan Cameron 2023-01-02 18:18:06 +00:00 committed by Dmitry Torokhov
parent eb6abb8962
commit 3de717d137

View File

@ -3296,7 +3296,7 @@ static void mxt_remove(struct i2c_client *client)
data->regulators); data->regulators);
} }
static int __maybe_unused mxt_suspend(struct device *dev) static int mxt_suspend(struct device *dev)
{ {
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
struct mxt_data *data = i2c_get_clientdata(client); struct mxt_data *data = i2c_get_clientdata(client);
@ -3317,7 +3317,7 @@ static int __maybe_unused mxt_suspend(struct device *dev)
return 0; return 0;
} }
static int __maybe_unused mxt_resume(struct device *dev) static int mxt_resume(struct device *dev)
{ {
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
struct mxt_data *data = i2c_get_clientdata(client); struct mxt_data *data = i2c_get_clientdata(client);
@ -3338,7 +3338,7 @@ static int __maybe_unused mxt_resume(struct device *dev)
return 0; return 0;
} }
static SIMPLE_DEV_PM_OPS(mxt_pm_ops, mxt_suspend, mxt_resume); static DEFINE_SIMPLE_DEV_PM_OPS(mxt_pm_ops, mxt_suspend, mxt_resume);
static const struct of_device_id mxt_of_match[] = { static const struct of_device_id mxt_of_match[] = {
{ .compatible = "atmel,maxtouch", }, { .compatible = "atmel,maxtouch", },
@ -3375,7 +3375,7 @@ static struct i2c_driver mxt_driver = {
.name = "atmel_mxt_ts", .name = "atmel_mxt_ts",
.of_match_table = mxt_of_match, .of_match_table = mxt_of_match,
.acpi_match_table = ACPI_PTR(mxt_acpi_id), .acpi_match_table = ACPI_PTR(mxt_acpi_id),
.pm = &mxt_pm_ops, .pm = pm_sleep_ptr(&mxt_pm_ops),
}, },
.probe_new = mxt_probe, .probe_new = mxt_probe,
.remove = mxt_remove, .remove = mxt_remove,