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>
Thanks, patch looks good to me:
Reviewed-by: Hans de Goede <hdegoede@xxxxxxxxxx>
Regards,
Hans
> ---
> drivers/input/touchscreen/chipone_icn8505.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/input/touchscreen/chipone_icn8505.c b/drivers/input/touchscreen/chipone_icn8505.c
> index c421f4be2700..246bee0bee53 100644
> --- a/drivers/input/touchscreen/chipone_icn8505.c
> +++ b/drivers/input/touchscreen/chipone_icn8505.c
> @@ -460,7 +460,7 @@ static int icn8505_probe(struct i2c_client *client)
> return 0;
> }
>
> -static int __maybe_unused icn8505_suspend(struct device *dev)
> +static int icn8505_suspend(struct device *dev)
> {
> struct icn8505_data *icn8505 = i2c_get_clientdata(to_i2c_client(dev));
>
> @@ -471,7 +471,7 @@ static int __maybe_unused icn8505_suspend(struct device *dev)
> return 0;
> }
>
> -static int __maybe_unused icn8505_resume(struct device *dev)
> +static int icn8505_resume(struct device *dev)
> {
> struct icn8505_data *icn8505 = i2c_get_clientdata(to_i2c_client(dev));
> int error;
> @@ -484,7 +484,7 @@ static int __maybe_unused icn8505_resume(struct device *dev)
> return 0;
> }
>
> -static SIMPLE_DEV_PM_OPS(icn8505_pm_ops, icn8505_suspend, icn8505_resume);
> +static DEFINE_SIMPLE_DEV_PM_OPS(icn8505_pm_ops, icn8505_suspend, icn8505_resume);
>
> static const struct acpi_device_id icn8505_acpi_match[] = {
> { "CHPN0001" },
> @@ -495,7 +495,7 @@ MODULE_DEVICE_TABLE(acpi, icn8505_acpi_match);
> static struct i2c_driver icn8505_driver = {
> .driver = {
> .name = "chipone_icn8505",
> - .pm = &icn8505_pm_ops,
> + .pm = pm_sleep_ptr(&icn8505_pm_ops),
> .acpi_match_table = icn8505_acpi_match,
> },
> .probe_new = icn8505_probe,
