| Message ID | 20180731134740.441-3-alexandre.belloni@bootlin.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Add support for MSCC Ocelot i2c | expand |
On Tue, 2018-07-31 at 15:47 +0200, Alexandre Belloni wrote: > 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. > Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> > --- > drivers/i2c/busses/i2c-designware-platdrv.c | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > > diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c > b/drivers/i2c/busses/i2c-designware-platdrv.c > index 00bf62f77c47..ba142d7c0e05 100644 > --- a/drivers/i2c/busses/i2c-designware-platdrv.c > +++ b/drivers/i2c/busses/i2c-designware-platdrv.c > @@ -157,6 +157,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; > @@ -391,14 +399,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) > {
diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c index 00bf62f77c47..ba142d7c0e05 100644 --- a/drivers/i2c/busses/i2c-designware-platdrv.c +++ b/drivers/i2c/busses/i2c-designware-platdrv.c @@ -157,6 +157,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; @@ -391,14 +399,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) {
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. Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> --- drivers/i2c/busses/i2c-designware-platdrv.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)