RE: [PATCH 03/28] mfd: adp5520: Remove #ifdef guards for PM related functions

[Hennerich, Michael]

> -----Original Message-----
> From: Paul Cercueil <paul@xxxxxxxxxxxxxxx>
> Sent: Sonntag, 7. August 2022 16:52
> To: Lee Jones <lee.jones@xxxxxxxxxx>
> Cc: linux-kernel@xxxxxxxxxxxxxxx; Paul Cercueil <paul@xxxxxxxxxxxxxxx>;
> Hennerich, Michael <Michael.Hennerich@xxxxxxxxxx>
> Subject: [PATCH 03/28] mfd: adp5520: Remove #ifdef guards for PM related
> functions
> 
> 
> Use the new DEFINE_SIMPLE_DEV_PM_OPS() and pm_sleep_ptr() macros
> to handle the .suspend/.resume callbacks.
> 
> These macros allow the suspend and resume functions to be automatically
> dropped by the compiler when CONFIG_SUSPEND is disabled, without
> having to use #ifdef guards.
> 
> The advantage is then that these functions are now always compiled
> independently of any Kconfig option, and thanks to that bugs and
> regressions are easier to catch.
> 
> Signed-off-by: Paul Cercueil <paul@xxxxxxxxxxxxxxx>
> Cc: Michael Hennerich <michael.hennerich@xxxxxxxxxx>

Acked-by: Michael Hennerich <michael.hennerich@xxxxxxxxxx>

> ---
>  drivers/mfd/adp5520.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/mfd/adp5520.c b/drivers/mfd/adp5520.c index
> 8db15f5a7179..882eddc32f8e 100644
> --- a/drivers/mfd/adp5520.c
> +++ b/drivers/mfd/adp5520.c
> @@ -305,7 +305,6 @@ static int adp5520_probe(struct i2c_client *client,
>  	return ret;
>  }
> 
> -#ifdef CONFIG_PM_SLEEP
>  static int adp5520_suspend(struct device *dev)  {
>  	struct i2c_client *client = to_i2c_client(dev); @@ -326,9 +325,8 @@
> static int adp5520_resume(struct device *dev)
>  	adp5520_write(chip->dev, ADP5520_MODE_STATUS, chip->mode);
>  	return 0;
>  }
> -#endif
> 
> -static SIMPLE_DEV_PM_OPS(adp5520_pm, adp5520_suspend,
> adp5520_resume);
> +static DEFINE_SIMPLE_DEV_PM_OPS(adp5520_pm, adp5520_suspend,
> +adp5520_resume);
> 
>  static const struct i2c_device_id adp5520_id[] = {
>  	{ "pmic-adp5520", ID_ADP5520 },
> @@ -339,7 +337,7 @@ static const struct i2c_device_id adp5520_id[] = {
> static struct i2c_driver adp5520_driver = {
>  	.driver = {
>  		.name			= "adp5520",
> -		.pm			= &adp5520_pm,
> +		.pm			= pm_sleep_ptr(&adp5520_pm),
>  		.suppress_bind_attrs	= true,
>  	},
>  	.probe		= adp5520_probe,
> --
> 2.35.1