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

i2c: nomadik: 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>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/20230722115046.27323-14-paul@crapouillou.net


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

drivers/i2c/busses/i2c-nomadik.c

+3 −9
Original line number Diff line number Diff line
@@ -873,7 +873,6 @@ static irqreturn_t i2c_irq_handler(int irq, void *arg) 
	return IRQ_HANDLED;

}



#ifdef CONFIG_PM_SLEEP

static int nmk_i2c_suspend_late(struct device *dev)

{

	int ret;
@@ -890,9 +889,7 @@ static int nmk_i2c_resume_early(struct device *dev) 
{

	return pm_runtime_force_resume(dev);

}

#endif



#ifdef CONFIG_PM

static int nmk_i2c_runtime_suspend(struct device *dev)

{

	struct amba_device *adev = to_amba_device(dev);
@@ -925,13 +922,10 @@ static int nmk_i2c_runtime_resume(struct device *dev) 


	return ret;

}

#endif



static const struct dev_pm_ops nmk_i2c_pm = {

	SET_LATE_SYSTEM_SLEEP_PM_OPS(nmk_i2c_suspend_late, nmk_i2c_resume_early)

	SET_RUNTIME_PM_OPS(nmk_i2c_runtime_suspend,

			nmk_i2c_runtime_resume,

			NULL)

	LATE_SYSTEM_SLEEP_PM_OPS(nmk_i2c_suspend_late, nmk_i2c_resume_early)

	RUNTIME_PM_OPS(nmk_i2c_runtime_suspend, nmk_i2c_runtime_resume, NULL)

};



static unsigned int nmk_i2c_functionality(struct i2c_adapter *adap)
@@ -1078,7 +1072,7 @@ static struct amba_driver nmk_i2c_driver = { 
	.drv = {

		.owner = THIS_MODULE,

		.name = DRIVER_NAME,

		.pm = &nmk_i2c_pm,

		.pm = pm_ptr(&nmk_i2c_pm),

	},

	.id_table = nmk_i2c_ids,

	.probe = nmk_i2c_probe,