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

i2c: designware: 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 avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: default avatarJarkko Nikula <jarkko.nikula@linux.intel.com>
Link: https://lore.kernel.org/r/20230722115046.27323-6-paul@crapouillou.net


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

drivers/i2c/busses/i2c-designware-platdrv.c

+6 −16
Original line number Diff line number Diff line
@@ -418,7 +418,6 @@ static void dw_i2c_plat_remove(struct platform_device *pdev) 
	reset_control_assert(dev->rst);

}



#ifdef CONFIG_PM_SLEEP

static int dw_i2c_plat_prepare(struct device *dev)

{

	/*
@@ -429,11 +428,7 @@ static int dw_i2c_plat_prepare(struct device *dev) 
	 */

	return !has_acpi_companion(dev);

}

#else

#define dw_i2c_plat_prepare	NULL

#endif



#ifdef CONFIG_PM

static int dw_i2c_plat_runtime_suspend(struct device *dev)

{

	struct dw_i2c_dev *i_dev = dev_get_drvdata(dev);
@@ -447,7 +442,7 @@ static int dw_i2c_plat_runtime_suspend(struct device *dev) 
	return 0;

}



static int __maybe_unused dw_i2c_plat_suspend(struct device *dev)

static int dw_i2c_plat_suspend(struct device *dev)

{

	struct dw_i2c_dev *i_dev = dev_get_drvdata(dev);
@@ -468,7 +463,7 @@ static int dw_i2c_plat_runtime_resume(struct device *dev) 
	return 0;

}



static int __maybe_unused dw_i2c_plat_resume(struct device *dev)

static int dw_i2c_plat_resume(struct device *dev)

{

	struct dw_i2c_dev *i_dev = dev_get_drvdata(dev);
@@ -479,16 +474,11 @@ static int __maybe_unused dw_i2c_plat_resume(struct device *dev) 
}



static const struct dev_pm_ops dw_i2c_dev_pm_ops = {

	.prepare = dw_i2c_plat_prepare,

	SET_LATE_SYSTEM_SLEEP_PM_OPS(dw_i2c_plat_suspend, dw_i2c_plat_resume)

	SET_RUNTIME_PM_OPS(dw_i2c_plat_runtime_suspend, dw_i2c_plat_runtime_resume, NULL)

	.prepare = pm_sleep_ptr(dw_i2c_plat_prepare),

	LATE_SYSTEM_SLEEP_PM_OPS(dw_i2c_plat_suspend, dw_i2c_plat_resume)

	RUNTIME_PM_OPS(dw_i2c_plat_runtime_suspend, dw_i2c_plat_runtime_resume, NULL)

};



#define DW_I2C_DEV_PMOPS (&dw_i2c_dev_pm_ops)

#else

#define DW_I2C_DEV_PMOPS NULL

#endif



/* Work with hotplug and coldplug */

MODULE_ALIAS("platform:i2c_designware");
@@ -499,7 +489,7 @@ static struct platform_driver dw_i2c_driver = { 
		.name	= "i2c_designware",

		.of_match_table = of_match_ptr(dw_i2c_of_match),

		.acpi_match_table = ACPI_PTR(dw_i2c_acpi_match),

		.pm	= DW_I2C_DEV_PMOPS,

		.pm	= pm_ptr(&dw_i2c_dev_pm_ops),

	},

};