Skip to contentSkip to conversation

i2c: designware: fix platform driver probe rename

PATCH In review Arnd Bergmann 2 participants 2 messages Oct 21, 2015

Subsystems (3)
I2C subsystem host drivers Intel LPSS (Low Power SubSystem) drivers Synopsys DesignWare I2C driver
lore
Share & tools
lore

Arnd Bergmann

author
#0 lore raw

PATCH 1/1 i2c: designware: fix platform driver probe rename

A function rename was incomplete and missed the !CONFIG_PM case:

i2c-designware-platdrv.c:340:13: error: 'dw_i2c_plat_prepare' undeclared here (not in a function) i2c-designware-platdrv.c:341:14: error: 'dw_i2c_plat_complete' undeclared here (not in a function)

This renames the macros accordingly.

Signed-off-by Arnd Bergmann <[email protected]>
Fixes 6ad6fde3970c ("i2c: designware: Rename platform driver probe and PM functions")

---
Found on ARM randconfig builds

drivers/i2c/busses/i2c-designware-platdrv.c +2 -2
index f6b252a8ffd1..eb55760ccd9f 100644
@@ -307,8 +307,8 @@ static void dw_i2c_plat_complete(struct device *dev)
 		pm_request_resume(dev);
 }
 #else
-#define dw_i2c_prepare	NULL
-#define dw_i2c_complete	NULL
+#define dw_i2c_plat_prepare	NULL
+#define dw_i2c_plat_complete	NULL
 #endif
 
 #ifdef CONFIG_PM
reviewer
#1 lore raw
Quoted 9 lines · Arnd Bergmann

A function rename was incomplete and missed the !CONFIG_PM case:

i2c-designware-platdrv.c:340:13: error: 'dw_i2c_plat_prepare' undeclared here (not in a function) i2c-designware-platdrv.c:341:14: error: 'dw_i2c_plat_complete' undeclared here (not in a function)

This renames the macros accordingly.

Jarkko sent this already couple hours ago.

Quoted 25 lines
Signed-off-by Arnd Bergmann <[email protected]>
Fixes 6ad6fde3970c ("i2c: designware: Rename platform driver probe

and PM functions")
---
Found on ARM randconfig builds

drivers/i2c/busses/i2c-designware-platdrv.c +0 -0
index f6b252a8ffd1..eb55760ccd9f 100644
@@ -307,8 +307,8 @@ static void dw_i2c_plat_complete(struct device
 *dev)
 ?		pm_request_resume(dev);
 ?}

?#else

drivers/i2c/busses/i2c-designware-platdrv.c +2 -2
-#define dw_i2c_prepare	NULL
-#define dw_i2c_complete	NULL
+#define dw_i2c_plat_prepare	NULL
+#define dw_i2c_plat_complete	NULL

?#endif
?
?#ifdef CONFIG_PM

Signature · 2 lines
Andy Shevchenko <[email protected]>
Intel Finland Oy