Re: [PATCH 05/49] iio:accel:mc3230: Switch from CONFIG_PM_SLEEP guards to pm_ptr() / __maybe_unused

From: Hans de Goede <hdegoede@redhat.com>
To: Jonathan Cameron <jic23@kernel.org>, linux-iio@vger.kernel.org
Cc: Lars-Peter Clausen <lars@metafoo.de>,
	Paul Cercueil <paul@crapouillou.net>,
	Jonathan Cameron <Jonathan.Cameron@huawei.com>
Subject: Re: [PATCH 05/49] iio:accel:mc3230: Switch from CONFIG_PM_SLEEP guards to pm_ptr() / __maybe_unused
Date: Tue, 23 Nov 2021 22:37:38 +0100	[thread overview]
Message-ID: <4144afb4-1b8b-cbf8-0e42-27d6a010a278@redhat.com> (raw)
In-Reply-To: <20211123211019.2271440-6-jic23@kernel.org>

Hi,

On 11/23/21 22:09, Jonathan Cameron wrote:
> From: Jonathan Cameron <Jonathan.Cameron@huawei.com>
> 
> Letting the compiler remove these functions when the kernel is built
> without CONFIG_PM_SLEEP support is simpler and less error prone than the
> use of #ifdef based config guards.
> 
> Removing instances of this approach from IIO also stops them being
> copied into new drivers.
> 
> The pm_ptr() macro only removes the reference if CONFIG_PM is not
> set. It is possible for CONFIG_PM=y without CONFIG_SLEEP, so this
> will not always remove the pm_ops structure.
> 
> Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
> Cc: Hans de Goede <hdegoede@redhat.com>

Thanks, patch looks good to me:

Reviewed-by: Hans de Goede <hdegoede@redhat.com>

Regards,

Hans

> ---
>  drivers/iio/accel/mc3230.c | 8 +++-----
>  1 file changed, 3 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/iio/accel/mc3230.c b/drivers/iio/accel/mc3230.c
> index 735002b716f3..139c7f6839df 100644
> --- a/drivers/iio/accel/mc3230.c
> +++ b/drivers/iio/accel/mc3230.c
> @@ -160,8 +160,7 @@ static int mc3230_remove(struct i2c_client *client)
>  	return mc3230_set_opcon(iio_priv(indio_dev), MC3230_MODE_OPCON_STANDBY);
>  }
>  
> -#ifdef CONFIG_PM_SLEEP
> -static int mc3230_suspend(struct device *dev)
> +static __maybe_unused int mc3230_suspend(struct device *dev)
>  {
>  	struct mc3230_data *data;
>  
> @@ -170,7 +169,7 @@ static int mc3230_suspend(struct device *dev)
>  	return mc3230_set_opcon(data, MC3230_MODE_OPCON_STANDBY);
>  }
>  
> -static int mc3230_resume(struct device *dev)
> +static __maybe_unused int mc3230_resume(struct device *dev)
>  {
>  	struct mc3230_data *data;
>  
> @@ -178,7 +177,6 @@ static int mc3230_resume(struct device *dev)
>  
>  	return mc3230_set_opcon(data, MC3230_MODE_OPCON_WAKE);
>  }
> -#endif
>  
>  static SIMPLE_DEV_PM_OPS(mc3230_pm_ops, mc3230_suspend, mc3230_resume);
>  
> @@ -191,7 +189,7 @@ MODULE_DEVICE_TABLE(i2c, mc3230_i2c_id);
>  static struct i2c_driver mc3230_driver = {
>  	.driver = {
>  		.name = "mc3230",
> -		.pm = &mc3230_pm_ops,
> +		.pm = pm_ptr(&mc3230_pm_ops),
>  	},
>  	.probe		= mc3230_probe,
>  	.remove		= mc3230_remove,
> 