* [PATCH] regmap: Fix regmap compilation with CONFIG_DEBUGFS=n
@ 2011-09-05 19:29 Lars-Peter Clausen
2011-09-05 19:42 ` Mark Brown
0 siblings, 1 reply; 4+ messages in thread
From: Lars-Peter Clausen @ 2011-09-05 19:29 UTC (permalink / raw)
To: Mark Brown; +Cc: linux-kernel, Lars-Peter Clausen
With CONFIG_DEBUGFS disabled the regmap compilation fails with the following
errors:
drivers/base/regmap/regcache.o: In function `regmap_debugfs_initcall':
drivers/base/regmap/internal.h:96: multiple definition of `regmap_debugfs_initcall'
drivers/base/regmap/regmap.o:drivers/base/regmap/internal.h:96: first defined here
drivers/base/regmap/regcache.o: In function `regmap_debugfs_init':
drivers/base/regmap/internal.h:97: multiple definition of `regmap_debugfs_init'
drivers/base/regmap/regmap.o:drivers/base/regmap/internal.h:97: first
defined here drivers/base/regmap/regcache.o: In function `regmap_debugfs_exit':
...
Make the debugfs stubs static inline to fix this.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
drivers/base/regmap/internal.h | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/base/regmap/internal.h b/drivers/base/regmap/internal.h
index 5ab3fef..b4acd94 100644
--- a/drivers/base/regmap/internal.h
+++ b/drivers/base/regmap/internal.h
@@ -58,9 +58,9 @@ extern void regmap_debugfs_initcall(void);
extern void regmap_debugfs_init(struct regmap *map);
extern void regmap_debugfs_exit(struct regmap *map);
#else
-void regmap_debugfs_initcall(void) { }
-void regmap_debugfs_init(struct regmap *map) { }
-void regmap_debugfs_exit(struct regmap *map) { }
+static inline void regmap_debugfs_initcall(void) { }
+static inline void regmap_debugfs_init(struct regmap *map) { }
+static inline void regmap_debugfs_exit(struct regmap *map) { }
#endif
#endif
--
1.7.2.5
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] regmap: Fix regmap compilation with CONFIG_DEBUGFS=n
2011-09-05 19:29 [PATCH] regmap: Fix regmap compilation with CONFIG_DEBUGFS=n Lars-Peter Clausen
@ 2011-09-05 19:42 ` Mark Brown
2011-09-05 19:53 ` Lars-Peter Clausen
0 siblings, 1 reply; 4+ messages in thread
From: Mark Brown @ 2011-09-05 19:42 UTC (permalink / raw)
To: Lars-Peter Clausen; +Cc: linux-kernel
On Mon, Sep 05, 2011 at 09:29:38PM +0200, Lars-Peter Clausen wrote:
> With CONFIG_DEBUGFS disabled the regmap compilation fails with the following
> errors:
> drivers/base/regmap/regcache.o: In function `regmap_debugfs_initcall':
> drivers/base/regmap/internal.h:96: multiple definition of `regmap_debugfs_initcall'
> drivers/base/regmap/regmap.o:drivers/base/regmap/internal.h:96: first defined here
> drivers/base/regmap/regcache.o: In function `regmap_debugfs_init':
I sense that this doesn't actually happen in mainline...
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] regmap: Fix regmap compilation with CONFIG_DEBUGFS=n
2011-09-05 19:42 ` Mark Brown
@ 2011-09-05 19:53 ` Lars-Peter Clausen
2011-09-05 19:55 ` Mark Brown
0 siblings, 1 reply; 4+ messages in thread
From: Lars-Peter Clausen @ 2011-09-05 19:53 UTC (permalink / raw)
To: Mark Brown; +Cc: linux-kernel
On 09/05/2011 09:42 PM, Mark Brown wrote:
> On Mon, Sep 05, 2011 at 09:29:38PM +0200, Lars-Peter Clausen wrote:
>> With CONFIG_DEBUGFS disabled the regmap compilation fails with the following
>> errors:
>
>> drivers/base/regmap/regcache.o: In function `regmap_debugfs_initcall':
>> drivers/base/regmap/internal.h:96: multiple definition of `regmap_debugfs_initcall'
>> drivers/base/regmap/regmap.o:drivers/base/regmap/internal.h:96: first defined here
>> drivers/base/regmap/regcache.o: In function `regmap_debugfs_init':
>
> I sense that this doesn't actually happen in mainline...
Uhm, yes... the patch is still valid though, want me to resubmit it with a
different patch description?
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] regmap: Fix regmap compilation with CONFIG_DEBUGFS=n
2011-09-05 19:53 ` Lars-Peter Clausen
@ 2011-09-05 19:55 ` Mark Brown
0 siblings, 0 replies; 4+ messages in thread
From: Mark Brown @ 2011-09-05 19:55 UTC (permalink / raw)
To: Lars-Peter Clausen; +Cc: linux-kernel
On Mon, Sep 05, 2011 at 09:53:49PM +0200, Lars-Peter Clausen wrote:
> On 09/05/2011 09:42 PM, Mark Brown wrote:
> > I sense that this doesn't actually happen in mainline...
> Uhm, yes... the patch is still valid though, want me to resubmit it with a
> different patch description?
Yes please, no problem with the patch itself but the description was
obviously bogus (it's fixing a future problem, not a current one).
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-09-05 19:55 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-09-05 19:29 [PATCH] regmap: Fix regmap compilation with CONFIG_DEBUGFS=n Lars-Peter Clausen
2011-09-05 19:42 ` Mark Brown
2011-09-05 19:53 ` Lars-Peter Clausen
2011-09-05 19:55 ` Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox