From: Lars-Peter Clausen <lars@metafoo.de>
To: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: linux-kernel@vger.kernel.org, Lars-Peter Clausen <lars@metafoo.de>
Subject: [PATCH] regmap: Fix regmap compilation with CONFIG_DEBUGFS=n
Date: Mon, 5 Sep 2011 21:29:38 +0200 [thread overview]
Message-ID: <1315250978-4242-1-git-send-email-lars@metafoo.de> (raw)
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
next reply other threads:[~2011-09-05 19:30 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-05 19:29 Lars-Peter Clausen [this message]
2011-09-05 19:42 ` Mark Brown
2011-09-05 19:53 ` Lars-Peter Clausen
2011-09-05 19:55 ` Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1315250978-4242-1-git-send-email-lars@metafoo.de \
--to=lars@metafoo.de \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®