[PATCH 03/23] i2c: iproc: Remove #ifdef guards for PM related functions

[Ray Jui]

On 7/5/2023 1:42 PM, Paul Cercueil wrote:
> Use the new 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: Paul Cercueil <paul at crapouillou.net>
> 
> ---
> Cc: Ray Jui <rjui at broadcom.com>
> Cc: Scott Branden <sbranden at broadcom.com>
> Cc: Broadcom internal kernel review list <bcm-kernel-feedback-list at broadcom.com>
> Cc: linux-arm-kernel at lists.infradead.org
> ---
>  drivers/i2c/busses/i2c-bcm-iproc.c | 10 +---------
>  1 file changed, 1 insertion(+), 9 deletions(-)
> 
> diff --git a/drivers/i2c/busses/i2c-bcm-iproc.c b/drivers/i2c/busses/i2c-bcm-iproc.c
> index 2d8342fdc25d..8a3e2208475c 100644
> --- a/drivers/i2c/busses/i2c-bcm-iproc.c
> +++ b/drivers/i2c/busses/i2c-bcm-iproc.c
> @@ -1125,8 +1125,6 @@ static void bcm_iproc_i2c_remove(struct platform_device *pdev)
>  	bcm_iproc_i2c_enable_disable(iproc_i2c, false);
>  }
>  
> -#ifdef CONFIG_PM_SLEEP
> -
>  static int bcm_iproc_i2c_suspend(struct device *dev)
>  {
>  	struct bcm_iproc_i2c_dev *iproc_i2c = dev_get_drvdata(dev);
> @@ -1177,12 +1175,6 @@ static const struct dev_pm_ops bcm_iproc_i2c_pm_ops = {
>  	.resume_early = &bcm_iproc_i2c_resume
>  };
>  
> -#define BCM_IPROC_I2C_PM_OPS (&bcm_iproc_i2c_pm_ops)
> -#else
> -#define BCM_IPROC_I2C_PM_OPS NULL
> -#endif /* CONFIG_PM_SLEEP */
> -
> -
>  static int bcm_iproc_i2c_reg_slave(struct i2c_client *slave)
>  {
>  	struct bcm_iproc_i2c_dev *iproc_i2c = i2c_get_adapdata(slave->adapter);
> @@ -1255,7 +1247,7 @@ static struct platform_driver bcm_iproc_i2c_driver = {
>  	.driver = {
>  		.name = "bcm-iproc-i2c",
>  		.of_match_table = bcm_iproc_i2c_of_match,
> -		.pm = BCM_IPROC_I2C_PM_OPS,
> +		.pm = pm_sleep_ptr(&bcm_iproc_i2c_pm_ops),
>  	},
>  	.probe = bcm_iproc_i2c_probe,
>  	.remove_new = bcm_iproc_i2c_remove,

Thanks.

Acked-by: Ray Jui <ray.jui at broadcom.com>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 4194 bytes
Desc: S/MIME Cryptographic Signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20230706/7ef7b252/attachment-0001.p7s>