Commit b40c4dac authored by Jisheng Zhang's avatar Jisheng Zhang Committed by Bartosz Golaszewski
Browse files

gpio: pl061: Use modern PM macros 



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.

The pl061_context_save_regs structure is always embedded into struct
pl061 to simplify code, so this brings a tiny 8 bytes memory overhead
for !CONFIG_PM_SLEEP.

Signed-off-by: default avatarJisheng Zhang <jszhang@kernel.org>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@intel.com>
Link: https://lore.kernel.org/r/20251124002105.25429-5-jszhang@kernel.org


Signed-off-by: default avatarBartosz Golaszewski <bartosz.golaszewski@linaro.org>
parent 2557b1f4

drivers/gpio/gpio-pl061.c

+2 −15
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ 


#define PL061_GPIO_NR	8



#ifdef CONFIG_PM

struct pl061_context_save_regs {

	u8 gpio_data;

	u8 gpio_dir;
@@ -46,7 +45,6 @@ struct pl061_context_save_regs { 
	u8 gpio_iev;

	u8 gpio_ie;

};

#endif



struct pl061 {

	raw_spinlock_t		lock;
@@ -55,9 +53,7 @@ struct pl061 { 
	struct gpio_chip	gc;

	int			parent_irq;



#ifdef CONFIG_PM

	struct pl061_context_save_regs csave_regs;

#endif

};



static int pl061_get_direction(struct gpio_chip *gc, unsigned offset)
@@ -367,7 +363,6 @@ static int pl061_probe(struct amba_device *adev, const struct amba_id *id) 
	return 0;

}



#ifdef CONFIG_PM

static int pl061_suspend(struct device *dev)

{

	struct pl061 *pl061 = dev_get_drvdata(dev);
@@ -411,13 +406,7 @@ static int pl061_resume(struct device *dev) 
	return 0;

}



static const struct dev_pm_ops pl061_dev_pm_ops = {

	.suspend = pl061_suspend,

	.resume = pl061_resume,

	.freeze = pl061_suspend,

	.restore = pl061_resume,

};

#endif

static DEFINE_SIMPLE_DEV_PM_OPS(pl061_dev_pm_ops, pl061_suspend, pl061_resume);



static const struct amba_id pl061_ids[] = {

	{
@@ -431,9 +420,7 @@ MODULE_DEVICE_TABLE(amba, pl061_ids); 
static struct amba_driver pl061_gpio_driver = {

	.drv = {

		.name	= "pl061_gpio",

#ifdef CONFIG_PM

		.pm	= &pl061_dev_pm_ops,

#endif

		.pm	= pm_sleep_ptr(&pl061_dev_pm_ops),

	},

	.id_table	= pl061_ids,

	.probe		= pl061_probe,