Commit 0ad93449 authored by Paul Cercueil's avatar Paul Cercueil Committed by Andi Shyti
Browse files

i2c: ocores: 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-15-paul@crapouillou.net


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

drivers/i2c/busses/i2c-ocores.c

+3 −7
Original line number Diff line number Diff line
@@ -743,7 +743,6 @@ static void ocores_i2c_remove(struct platform_device *pdev) 
	i2c_del_adapter(&i2c->adap);

}



#ifdef CONFIG_PM_SLEEP

static int ocores_i2c_suspend(struct device *dev)

{

	struct ocores_i2c *i2c = dev_get_drvdata(dev);
@@ -772,11 +771,8 @@ static int ocores_i2c_resume(struct device *dev) 
	return ocores_init(dev, i2c);

}



static SIMPLE_DEV_PM_OPS(ocores_i2c_pm, ocores_i2c_suspend, ocores_i2c_resume);

#define OCORES_I2C_PM	(&ocores_i2c_pm)

#else

#define OCORES_I2C_PM	NULL

#endif

static DEFINE_SIMPLE_DEV_PM_OPS(ocores_i2c_pm,

				ocores_i2c_suspend, ocores_i2c_resume);



static struct platform_driver ocores_i2c_driver = {

	.probe   = ocores_i2c_probe,
@@ -784,7 +780,7 @@ static struct platform_driver ocores_i2c_driver = { 
	.driver  = {

		.name = "ocores-i2c",

		.of_match_table = ocores_i2c_match,

		.pm = OCORES_I2C_PM,

		.pm = pm_sleep_ptr(&ocores_i2c_pm),

	},

};