[PATCH 06/16] gpio: pxa: Use modern PM macros
From: Jisheng Zhang <jszhang@kernel.org>
Date: 2025-08-20 15:58:54
Also in:
linux-gpio, linux-omap, lkml
Subsystem:
gpio subsystem, pxa gpio driver, the rest · Maintainers:
Linus Walleij, Bartosz Golaszewski, Robert Jarzmik, Linus Torvalds
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 #ifdef guards. This has the advantage of always compiling these functions in, independently of any Kconfig option. Thanks to that, bugs and other regressions are subsequently easier to catch. Signed-off-by: Jisheng Zhang <jszhang@kernel.org> --- drivers/gpio/gpio-pxa.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/drivers/gpio/gpio-pxa.c b/drivers/gpio/gpio-pxa.c
index fa22f3faa163..288c72f9c015 100644
--- a/drivers/gpio/gpio-pxa.c
+++ b/drivers/gpio/gpio-pxa.c@@ -66,13 +66,10 @@ struct pxa_gpio_bank { unsigned long irq_mask; unsigned long irq_edge_rise; unsigned long irq_edge_fall; - -#ifdef CONFIG_PM unsigned long saved_gplr; unsigned long saved_gpdr; unsigned long saved_grer; unsigned long saved_gfer; -#endif }; struct pxa_gpio_chip {
@@ -746,7 +743,6 @@ static int __init pxa_gpio_dt_init(void) } device_initcall(pxa_gpio_dt_init); -#ifdef CONFIG_PM static int pxa_gpio_suspend(void) { struct pxa_gpio_chip *pchip = pxa_gpio_chip;
@@ -787,14 +783,10 @@ static void pxa_gpio_resume(void) writel_relaxed(c->saved_gpdr, c->regbase + GPDR_OFFSET); } } -#else -#define pxa_gpio_suspend NULL -#define pxa_gpio_resume NULL -#endif static struct syscore_ops pxa_gpio_syscore_ops = { - .suspend = pxa_gpio_suspend, - .resume = pxa_gpio_resume, + .suspend = pm_ptr(pxa_gpio_suspend), + .resume = pm_ptr(pxa_gpio_resume), }; static int __init pxa_gpio_sysinit(void)
--
2.50.1