Commit 6184f92f authored by Paul Cercueil's avatar Paul Cercueil Committed by Andi Shyti
Browse files

i2c: pnx: 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>
Link: https://lore.kernel.org/r/20230722115046.27323-16-paul@crapouillou.net


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

drivers/i2c/busses/i2c-pnx.c

+4 −8
Original line number Diff line number Diff line
@@ -613,7 +613,6 @@ static const struct i2c_algorithm pnx_algorithm = { 
	.functionality = i2c_pnx_func,

};



#ifdef CONFIG_PM_SLEEP

static int i2c_pnx_controller_suspend(struct device *dev)

{

	struct i2c_pnx_algo_data *alg_data = dev_get_drvdata(dev);
@@ -630,12 +629,9 @@ static int i2c_pnx_controller_resume(struct device *dev) 
	return clk_prepare_enable(alg_data->clk);

}



static SIMPLE_DEV_PM_OPS(i2c_pnx_pm,

			 i2c_pnx_controller_suspend, i2c_pnx_controller_resume);

#define PNX_I2C_PM	(&i2c_pnx_pm)

#else

#define PNX_I2C_PM	NULL

#endif

static DEFINE_SIMPLE_DEV_PM_OPS(i2c_pnx_pm,

				i2c_pnx_controller_suspend,

				i2c_pnx_controller_resume);



static int i2c_pnx_probe(struct platform_device *pdev)

{
@@ -763,7 +759,7 @@ static struct platform_driver i2c_pnx_driver = { 
	.driver = {

		.name = "pnx-i2c",

		.of_match_table = of_match_ptr(i2c_pnx_of_match),

		.pm = PNX_I2C_PM,

		.pm = pm_sleep_ptr(&i2c_pnx_pm),

	},

	.probe = i2c_pnx_probe,

	.remove_new = i2c_pnx_remove,