Use the modern PM macros for the suspend and resume functions to be
automatically dropped by the compiler when CONFIG_PM or
CONFIG_PM_SLEEP are disabled, without having to use __maybe_unused

Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
---
 drivers/gpio/gpio-tqmx86.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/drivers/gpio/gpio-tqmx86.c b/drivers/gpio/gpio-tqmx86.c
index 27dd09273292..d79f515137a5 100644
--- a/drivers/gpio/gpio-tqmx86.c
+++ b/drivers/gpio/gpio-tqmx86.c
@@ -279,19 +279,18 @@ static void tqmx86_gpio_irq_handler(struct irq_desc *desc)
 }
 
 /* Minimal runtime PM is needed by the IRQ subsystem */
-static int __maybe_unused tqmx86_gpio_runtime_suspend(struct device *dev)
+static int tqmx86_gpio_runtime_suspend(struct device *dev)
 {
 	return 0;
 }
 
-static int __maybe_unused tqmx86_gpio_runtime_resume(struct device *dev)
+static int tqmx86_gpio_runtime_resume(struct device *dev)
 {
 	return 0;
 }
 
 static const struct dev_pm_ops tqmx86_gpio_dev_pm_ops = {
-	SET_RUNTIME_PM_OPS(tqmx86_gpio_runtime_suspend,
-			   tqmx86_gpio_runtime_resume, NULL)
+	RUNTIME_PM_OPS(tqmx86_gpio_runtime_suspend, tqmx86_gpio_runtime_resume, NULL)
 };
 
 static void tqmx86_init_irq_valid_mask(struct gpio_chip *chip,
@@ -425,7 +424,7 @@ static int tqmx86_gpio_probe(struct platform_device *pdev)
 static struct platform_driver tqmx86_gpio_driver = {
 	.driver = {
 		.name = "tqmx86-gpio",
-		.pm = &tqmx86_gpio_dev_pm_ops,
+		.pm = pm_sleep_ptr(&tqmx86_gpio_dev_pm_ops),
 	},
 	.probe		= tqmx86_gpio_probe,
 };
-- 
2.51.0

On Thu, Nov 20, 2025 at 12:33:23AM +0800, Jisheng Zhang wrote:
> Use the modern PM macros for the suspend and resume functions to be
> automatically dropped by the compiler when CONFIG_PM or
> CONFIG_PM_SLEEP are disabled, without having to use __maybe_unused

...

>  static const struct dev_pm_ops tqmx86_gpio_dev_pm_ops = {
> -	SET_RUNTIME_PM_OPS(tqmx86_gpio_runtime_suspend,
> -			   tqmx86_gpio_runtime_resume, NULL)
> +	RUNTIME_PM_OPS(tqmx86_gpio_runtime_suspend, tqmx86_gpio_runtime_resume, NULL)
>  };

...

>  static struct platform_driver tqmx86_gpio_driver = {
>  	.driver = {
>  		.name = "tqmx86-gpio",
> -		.pm = &tqmx86_gpio_dev_pm_ops,
> +		.pm = pm_sleep_ptr(&tqmx86_gpio_dev_pm_ops),

For RPM this should be pm_ptr(), no?

>  	},

-- 
With Best Regards,
Andy Shevchenko

On Wed, Nov 19, 2025 at 07:19:58PM +0200, Andy Shevchenko wrote:
> On Thu, Nov 20, 2025 at 12:33:23AM +0800, Jisheng Zhang wrote:
> > Use the modern PM macros for the suspend and resume functions to be
> > automatically dropped by the compiler when CONFIG_PM or
> > CONFIG_PM_SLEEP are disabled, without having to use __maybe_unused
> 
> ...
> 
> >  static const struct dev_pm_ops tqmx86_gpio_dev_pm_ops = {
> > -	SET_RUNTIME_PM_OPS(tqmx86_gpio_runtime_suspend,
> > -			   tqmx86_gpio_runtime_resume, NULL)
> > +	RUNTIME_PM_OPS(tqmx86_gpio_runtime_suspend, tqmx86_gpio_runtime_resume, NULL)
> >  };
> 
> ...
> 
> >  static struct platform_driver tqmx86_gpio_driver = {
> >  	.driver = {
> >  		.name = "tqmx86-gpio",
> > -		.pm = &tqmx86_gpio_dev_pm_ops,
> > +		.pm = pm_sleep_ptr(&tqmx86_gpio_dev_pm_ops),
> 
> For RPM this should be pm_ptr(), no?

Indeed, pm_ptr() is better. Thanks. Let me do it in next version, I will
wait for one or two days as Bart kindly reminded ;)

> 
> >  	},
> 
> -- 
> With Best Regards,
> Andy Shevchenko
> 
>