All of lore.kernel.org
 help / color / mirror / Atom feed
From: Axel Lin <axel.lin@gmail.com>
To: linux-kernel@vger.kernel.org
Cc: Stephen Warren <swarren@nvidia.com>,
	Mark Brown <broonie@opensource.wolfsonmicro.com>
Subject: [linux-next][PATCH] regmap: fix build error if !CONFIG_DEBUG_FS
Date: Tue, 10 Apr 2012 14:12:47 +0800	[thread overview]
Message-ID: <1334038367.15859.12.camel@phoenix> (raw)

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




             reply	other threads:[~2012-04-10  6:13 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-04-10  6:12 Axel Lin [this message]
2012-04-10  8:43 ` [linux-next][PATCH] regmap: fix build error if !CONFIG_DEBUG_FS Mark Brown
2012-04-10  8:56   ` Axel Lin
2012-04-10 15:23     ` Stephen Warren

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=1334038367.15859.12.camel@phoenix \
    --to=axel.lin@gmail.com \
    --cc=broonie@opensource.wolfsonmicro.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=swarren@nvidia.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.