Hi,
On 1/2/23 19:18, Jonathan Cameron wrote:
> From: Jonathan Cameron <Jonathan.Cameron@xxxxxxxxxx>
>
> 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@xxxxxxxxxx>
> Cc: Hans de Goede <hdegoede@xxxxxxxxxx>
> Cc: Bastien Nocera <hadess@xxxxxxxxxx>
Thanks, patch looks good to me:
Reviewed-by: Hans de Goede <hdegoede@xxxxxxxxxx>
Regards,
Hans
> ---
> drivers/input/touchscreen/goodix.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/input/touchscreen/goodix.c b/drivers/input/touchscreen/goodix.c
> index 8a0a8078de8f..b348172f19c3 100644
> --- a/drivers/input/touchscreen/goodix.c
> +++ b/drivers/input/touchscreen/goodix.c
> @@ -1401,7 +1401,7 @@ static void goodix_ts_remove(struct i2c_client *client)
> wait_for_completion(&ts->firmware_loading_complete);
> }
>
> -static int __maybe_unused goodix_suspend(struct device *dev)
> +static int goodix_suspend(struct device *dev)
> {
> struct i2c_client *client = to_i2c_client(dev);
> struct goodix_ts_data *ts = i2c_get_clientdata(client);
> @@ -1448,7 +1448,7 @@ static int __maybe_unused goodix_suspend(struct device *dev)
> return 0;
> }
>
> -static int __maybe_unused goodix_resume(struct device *dev)
> +static int goodix_resume(struct device *dev)
> {
> struct i2c_client *client = to_i2c_client(dev);
> struct goodix_ts_data *ts = i2c_get_clientdata(client);
> @@ -1497,7 +1497,7 @@ static int __maybe_unused goodix_resume(struct device *dev)
> return 0;
> }
>
> -static SIMPLE_DEV_PM_OPS(goodix_pm_ops, goodix_suspend, goodix_resume);
> +static DEFINE_SIMPLE_DEV_PM_OPS(goodix_pm_ops, goodix_suspend, goodix_resume);
>
> static const struct i2c_device_id goodix_ts_id[] = {
> { "GDIX1001:00", 0 },
> @@ -1543,7 +1543,7 @@ static struct i2c_driver goodix_ts_driver = {
> .name = "Goodix-TS",
> .acpi_match_table = ACPI_PTR(goodix_acpi_match),
> .of_match_table = of_match_ptr(goodix_of_match),
> - .pm = &goodix_pm_ops,
> + .pm = pm_sleep_ptr(&goodix_pm_ops),
> },
> };
> module_i2c_driver(goodix_ts_driver);
