Skip to contentSkip to conversation

regmap: fix build error if !CONFIG_DEBUG_FS

PATCH In review Axel Lin 3 participants 4 messages Apr 10, 2012

Subsystems (2)
lore
Share & tools
lore

Axel Lin

author
#0 lore raw

PATCH 1/1 regmap: fix build error if !CONFIG_DEBUG_FS

Fix build error introduced by commit 9eba4d
"regmap: fix compilation when !CONFIG_DEBUG_FS".

CC drivers/base/regmap/regmap.o
drivers/base/regmap/regmap.c: In function 'regmap_init':
drivers/base/regmap/regmap.c:323: error: too few arguments to function 'regmap_debugfs_init' drivers/base/regmap/regmap.c: In function 'regmap_reinit_cache':
drivers/base/regmap/regmap.c:408: error: too few arguments to function 'regmap_debugfs_init' make[3]: *** [drivers/base/regmap/regmap.o] Error 1
make[2]: *** [drivers/base/regmap] Error 2
make[1]: *** [drivers/base] Error 2
make: *** [drivers] Error 2

---
In current code (linux-next 20120410), regmap_debugfs_init only takes one parameter.

 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.5.4
#1 lore raw
Quoted 2 lines · Axel Lin

Fix build error introduced by commit 9eba4d
"regmap: fix compilation when !CONFIG_DEBUG_FS".

I've no idea what tree you're testing against but Stephen's fix is needed for -next.

author
#2 lore raw

2012/4/10 Mark Brown <[email protected]>:

Quoted 6 lines · Axel Lin
Quoted 2 lines

Fix build error introduced by commit 9eba4d
"regmap: fix compilation when !CONFIG_DEBUG_FS".

I've no idea what tree you're testing against but Stephen's fix is needed for -next.

I'm testing with today's linux-next tree.
It's strange in today's linux-next tree that "git show 79c64d5" can show the commit,
but git log cannot find commit 79c64d5.

Regards,
Axel

#3 lore raw
Quoted 5 lines · Axel Lin

2012/4/10 Mark Brown <[email protected]>:

Quoted 4 lines · Axel Lin
Quoted 2 lines

Fix build error introduced by commit 9eba4d
"regmap: fix compilation when !CONFIG_DEBUG_FS".

Quoted 7 lines
Quoted 2 lines

I've no idea what tree you're testing against but Stephen's fix is needed for -next.

I'm testing with today's linux-next tree.
It's strange in today's linux-next tree that "git show 79c64d5" can show the commit,
but git log cannot find commit 79c64d5.

I checked internal.h and regmap.c in next-20120410 and they seem exactly matched at present.

Yes, commit 79c64d5 doesn't exist. The real commit ID is d3c242e1f22f5dfed009296ee45ce896153f0b53 (i.e. the one right before commit 9eba4d). This is because the commit in question got moved between topic branches.