[30/69] Input: ad7877 - switch to DEFINE_SIMPLE_DEV_PM_OPS() and pm_sleep_ptr()

Commit Message

Jonathan Cameron Jan. 2, 2023, 6:18 p.m. UTC

From: Jonathan Cameron <[e-mail]>

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 <[e-mail]>
Cc: Michael Hennerich <[e-mail]>
---
 drivers/input/touchscreen/ad7877.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Comments

Hennerich, Michael Jan. 9, 2023, 10:18 a.m. UTC | #1

> -----Original Message-----
> From: Jonathan Cameron <[e-mail]>
> Sent: Montag, 2. Januar 2023 19:18
> To: [e-mail]; Dmitry Torokhov
> <[e-mail]>
> Cc: Jonathan Cameron <[e-mail]>; Hennerich, Michael
> <[e-mail]>
> Subject: [PATCH 30/69] Input: ad7877 - switch to
> DEFINE_SIMPLE_DEV_PM_OPS() and pm_sleep_ptr()
> 
> 
> From: Jonathan Cameron <[e-mail]>
> 
> 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 <[e-mail]>
> Cc: Michael Hennerich <[e-mail]>

Acked-by: Michael Hennerich <[e-mail]>

> ---
>  drivers/input/touchscreen/ad7877.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/input/touchscreen/ad7877.c
> b/drivers/input/touchscreen/ad7877.c
> index 08f5372f0bfd..edb36d663f22 100644
> --- a/drivers/input/touchscreen/ad7877.c
> +++ b/drivers/input/touchscreen/ad7877.c
> @@ -788,7 +788,7 @@ static int ad7877_probe(struct spi_device *spi)
>  	return 0;
>  }
> 
> -static int __maybe_unused ad7877_suspend(struct device *dev)
> +static int ad7877_suspend(struct device *dev)
>  {
>  	struct ad7877 *ts = dev_get_drvdata(dev);
> 
> @@ -797,7 +797,7 @@ static int __maybe_unused ad7877_suspend(struct
> device *dev)
>  	return 0;
>  }
> 
> -static int __maybe_unused ad7877_resume(struct device *dev)
> +static int ad7877_resume(struct device *dev)
>  {
>  	struct ad7877 *ts = dev_get_drvdata(dev);
> 
> @@ -806,12 +806,12 @@ static int __maybe_unused ad7877_resume(struct
> device *dev)
>  	return 0;
>  }
> 
> -static SIMPLE_DEV_PM_OPS(ad7877_pm, ad7877_suspend, ad7877_resume);
> +static DEFINE_SIMPLE_DEV_PM_OPS(ad7877_pm, ad7877_suspend,
> +ad7877_resume);
> 
>  static struct spi_driver ad7877_driver = {
>  	.driver = {
>  		.name	= "ad7877",
> -		.pm	= &ad7877_pm,
> +		.pm	= pm_sleep_ptr(&ad7877_pm),
>  	},
>  	.probe		= ad7877_probe,
>  };
> --
> 2.39.0

Patch

diff --git a/drivers/input/touchscreen/ad7877.c b/drivers/input/touchscreen/ad7877.c
index 08f5372f0bfd..edb36d663f22 100644
--- a/drivers/input/touchscreen/ad7877.c
+++ b/drivers/input/touchscreen/ad7877.c
@@ -788,7 +788,7 @@  static int ad7877_probe(struct spi_device *spi)
 	return 0;
 }
 
-static int __maybe_unused ad7877_suspend(struct device *dev)
+static int ad7877_suspend(struct device *dev)
 {
 	struct ad7877 *ts = dev_get_drvdata(dev);
 
@@ -797,7 +797,7 @@  static int __maybe_unused ad7877_suspend(struct device *dev)
 	return 0;
 }
 
-static int __maybe_unused ad7877_resume(struct device *dev)
+static int ad7877_resume(struct device *dev)
 {
 	struct ad7877 *ts = dev_get_drvdata(dev);
 
@@ -806,12 +806,12 @@  static int __maybe_unused ad7877_resume(struct device *dev)
 	return 0;
 }
 
-static SIMPLE_DEV_PM_OPS(ad7877_pm, ad7877_suspend, ad7877_resume);
+static DEFINE_SIMPLE_DEV_PM_OPS(ad7877_pm, ad7877_suspend, ad7877_resume);
 
 static struct spi_driver ad7877_driver = {
 	.driver = {
 		.name	= "ad7877",
-		.pm	= &ad7877_pm,
+		.pm	= pm_sleep_ptr(&ad7877_pm),
 	},
 	.probe		= ad7877_probe,
 };