i2c: designware: move #ifdef CONFIG_OF to the top (96742775) · Commits · 戴 / test

Move the #ifdef CONFIG_OF section to the top of the file, after the ACPI section so functions defined there can be used in dw_i2c_plat_probe. Tested-by:

Jarkko Nikula <jarkko.nikula@linux.intel.com> Acked-by:

Jarkko Nikula <jarkko.nikula@linux.intel.com> Signed-off-by:

Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by:

Wolfram Sang <wsa@the-dreams.de>

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

+8 −8

Original line number	Diff line number	Diff line
		@@ -156,6 +156,14 @@ static inline int dw_i2c_acpi_configure(struct platform_device *pdev)
		}
		#endif

		#ifdef CONFIG_OF
		static const struct of_device_id dw_i2c_of_match[] = {
		{ .compatible = "snps,designware-i2c", },
		{},
		};
		MODULE_DEVICE_TABLE(of, dw_i2c_of_match);
		#endif

		static void i2c_dw_configure_master(struct dw_i2c_dev *dev)
		{
		struct i2c_timings *t = &dev->timings;
		@@ -390,14 +398,6 @@ static int dw_i2c_plat_remove(struct platform_device *pdev)
		return 0;
		}

		#ifdef CONFIG_OF
		static const struct of_device_id dw_i2c_of_match[] = {
		{ .compatible = "snps,designware-i2c", },
		{},
		};
		MODULE_DEVICE_TABLE(of, dw_i2c_of_match);
		#endif

		#ifdef CONFIG_PM_SLEEP
		static int dw_i2c_plat_prepare(struct device *dev)
		{

Admin message