On 8/20/2025 8:40 AM, 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 #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-brcmstb.c | 12 +++---------
> 1 file changed, 3 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/gpio/gpio-brcmstb.c b/drivers/gpio/gpio-brcmstb.c
> index e29a9589b3cc..0ca3e0d8aa46 100644
> --- a/drivers/gpio/gpio-brcmstb.c
> +++ b/drivers/gpio/gpio-brcmstb.c
> @@ -534,7 +534,6 @@ static void brcmstb_gpio_shutdown(struct platform_device *pdev)
> brcmstb_gpio_quiesce(&pdev->dev, false);
> }
>
> -#ifdef CONFIG_PM_SLEEP
> static void brcmstb_gpio_bank_restore(struct brcmstb_gpio_priv *priv,
> struct brcmstb_gpio_bank *bank)
> {
> @@ -573,14 +572,9 @@ static int brcmstb_gpio_resume(struct device *dev)
> return 0;
> }
>
> -#else
> -#define brcmstb_gpio_suspend NULL
> -#define brcmstb_gpio_resume NULL
> -#endif /* CONFIG_PM_SLEEP */
> -
> static const struct dev_pm_ops brcmstb_gpio_pm_ops = {
> - .suspend_noirq = brcmstb_gpio_suspend,
> - .resume_noirq = brcmstb_gpio_resume,
> + .suspend_noirq = pm_sleep_ptr(brcmstb_gpio_suspend),
> + .resume_noirq = pm_sleep_ptr(brcmstb_gpio_resume),
> };
>
> static int brcmstb_gpio_probe(struct platform_device *pdev)
> @@ -747,7 +741,7 @@ static struct platform_driver brcmstb_gpio_driver = {
> .driver = {
> .name = "brcmstb-gpio",
> .of_match_table = brcmstb_gpio_of_match,
> - .pm = &brcmstb_gpio_pm_ops,
> + .pm = pm_sleep_ptr(&brcmstb_gpio_pm_ops),
> },
> .probe = brcmstb_gpio_probe,
> .remove = brcmstb_gpio_remove,
Acked-by: Doug Berger <opendmb@gmail.com>