[linux-next][PATCH] regmap: fix build error if !CONFIG_DEBUG_FS

[linux-next][PATCH] regmap: fix build error if !CONFIG_DEBUG_FS

[Axel Lin]

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

Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
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(-)

diff --git a/drivers/base/regmap/internal.h b/drivers/base/regmap/internal.h
index 32c2947..e46c279 100644
--- a/drivers/base/regmap/internal.h
+++ b/drivers/base/regmap/internal.h
@@ -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
 
-- 
1.7.5.4

Re: [linux-next][PATCH] regmap: fix build error if !CONFIG_DEBUG_FS

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 241 bytes --]

On Tue, Apr 10, 2012 at 02:12:47PM +0800, Axel Lin wrote:
> 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.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [linux-next][PATCH] regmap: fix build error if !CONFIG_DEBUG_FS

[Axel Lin]

2012/4/10 Mark Brown <broonie@opensource.wolfsonmicro.com>:
> On Tue, Apr 10, 2012 at 02:12:47PM +0800, Axel Lin wrote:
>> 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

Re: [linux-next][PATCH] regmap: fix build error if !CONFIG_DEBUG_FS

[Stephen Warren]

On 04/10/2012 02:56 AM, Axel Lin wrote:
> 2012/4/10 Mark Brown <broonie@opensource.wolfsonmicro.com>:
>> On Tue, Apr 10, 2012 at 02:12:47PM +0800, Axel Lin wrote:
>>> 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.

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.