Commit 9dc96b75 authored by Paul Cercueil's avatar Paul Cercueil Committed by Andi Shyti
Browse files

i2c: iproc: Remove #ifdef guards for PM related functions 



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: default avatarPaul Cercueil <paul@crapouillou.net>
Reviewed-by: default avatarJonathan Cameron <jonathan.cameron@huawei.com>
Acked-by: default avatarRay Jui <ray.jui@broadcom.com>
Reviewed-by: default avatarFlorian Fainelli <florian.fainelli@broadcom.com>
Link: https://lore.kernel.org/r/20230722115046.27323-3-paul@crapouillou.net


Signed-off-by: default avatarAndi Shyti <andi.shyti@kernel.org>
parent 2f0a81a2

drivers/i2c/busses/i2c-bcm-iproc.c

+1 −9
Original line number Diff line number Diff line
@@ -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,