Skip to contentSkip to conversation

regmap: Fix build by removing extra parameter from regmap_debugfs_init()

PATCH In review Fabio Estevam 2 participants 2 messages Apr 10, 2012 – Apr 11, 2012

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 regmap: Fix build by removing extra parameter from regmap_debugfs_init()

commit b4eb511 (Merge branches 'regmap-mmio', 'regmap-naming' and 'regmap-linus' into regmap-next) added an extra paramter to the prototype of regmap_debugfs_init() in the case of !CONFIG_DEBUG_FS.

Remove this extra parameter so that the driver can build again when !CONFIG_DEBUG_FS.

---
This applies against linux-next

 drivers/base/regmap/internal.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/base/regmap/internal.h +1 -1
index 32c2947..e46c279 100644
@@ -112,7 +112,7 @@ extern void regmap_debugfs_init(struct regmap *map);
 extern void regmap_debugfs_exit(struct regmap *map);
 #else
 static inline void regmap_debugfs_initcall(void) { }
-static inline void regmap_debugfs_init(struct regmap *map, const char *name) { }
+static inline void regmap_debugfs_init(struct regmap *map) { }
 static inline void regmap_debugfs_exit(struct regmap *map) { }
 #endif
 
Signature · 1 line
1.7.1
#1 lore raw
Quoted 2 lines · Fabio Estevam

commit b4eb511 (Merge branches 'regmap-mmio', 'regmap-naming' and 'regmap-linus' into regmap-next) added an extra paramter to the prototype of regmap_debugfs_init() in the case of !CONFIG_DEBUG_FS.

No it doesn't. Some commit on one of the branches that got merged adds the parameter, and this was already fixed on that branch.