* [PATCH] regmap: Fix build failure with CONFIG_DEBUG_FS=n
@ 2011-11-22 8:24 Uwe Kleine-König
2011-11-22 9:21 ` Marc Kleine-Budde
2011-11-22 11:51 ` Mark Brown
0 siblings, 2 replies; 5+ messages in thread
From: Uwe Kleine-König @ 2011-11-22 8:24 UTC (permalink / raw)
To: linux-kernel; +Cc: kernel, Mark Brown
This fixes:
drivers/base/regmap/regcache-rbtree.c: In function 'regcache_rbtree_init':
drivers/base/regmap/regcache-rbtree.c:197: error: 'struct regmap' has no member named 'debugfs'
drivers/base/regmap/regcache-rbtree.c:197: error: 'rbtree_fops' undeclared (first use in this function)
drivers/base/regmap/regcache-rbtree.c:197: error: (Each undeclared identifier is reported only once
drivers/base/regmap/regcache-rbtree.c:197: error: for each function it appears in.)
which was introduced by commit
bad2ab4 (regmap: Provide debugfs dump of the rbtree cache data)
currently in next-20111122.
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
drivers/base/regmap/regcache-rbtree.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/drivers/base/regmap/regcache-rbtree.c b/drivers/base/regmap/regcache-rbtree.c
index 7767cbb..270ad65 100644
--- a/drivers/base/regmap/regcache-rbtree.c
+++ b/drivers/base/regmap/regcache-rbtree.c
@@ -194,7 +194,9 @@ static int regcache_rbtree_init(struct regmap *map)
goto err;
}
+#ifdef CONFIG_DEBUG_FS
debugfs_create_file("rbtree", 0400, map->debugfs, map, &rbtree_fops);
+#endif
return 0;
--
1.7.7.2
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] regmap: Fix build failure with CONFIG_DEBUG_FS=n
2011-11-22 8:24 [PATCH] regmap: Fix build failure with CONFIG_DEBUG_FS=n Uwe Kleine-König
@ 2011-11-22 9:21 ` Marc Kleine-Budde
2011-11-22 9:28 ` Uwe Kleine-König
2011-11-22 11:51 ` Mark Brown
1 sibling, 1 reply; 5+ messages in thread
From: Marc Kleine-Budde @ 2011-11-22 9:21 UTC (permalink / raw)
To: Uwe Kleine-König; +Cc: linux-kernel, kernel, Mark Brown
[-- Attachment #1: Type: text/plain, Size: 1778 bytes --]
On 11/22/2011 09:24 AM, Uwe Kleine-König wrote:
> This fixes:
>
> drivers/base/regmap/regcache-rbtree.c: In function 'regcache_rbtree_init':
> drivers/base/regmap/regcache-rbtree.c:197: error: 'struct regmap' has no member named 'debugfs'
> drivers/base/regmap/regcache-rbtree.c:197: error: 'rbtree_fops' undeclared (first use in this function)
> drivers/base/regmap/regcache-rbtree.c:197: error: (Each undeclared identifier is reported only once
> drivers/base/regmap/regcache-rbtree.c:197: error: for each function it appears in.)
>
> which was introduced by commit
>
> bad2ab4 (regmap: Provide debugfs dump of the rbtree cache data)
>
> currently in next-20111122.
>
> Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> ---
> drivers/base/regmap/regcache-rbtree.c | 2 ++
> 1 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/base/regmap/regcache-rbtree.c b/drivers/base/regmap/regcache-rbtree.c
> index 7767cbb..270ad65 100644
> --- a/drivers/base/regmap/regcache-rbtree.c
> +++ b/drivers/base/regmap/regcache-rbtree.c
> @@ -194,7 +194,9 @@ static int regcache_rbtree_init(struct regmap *map)
> goto err;
> }
>
> +#ifdef CONFIG_DEBUG_FS
> debugfs_create_file("rbtree", 0400, map->debugfs, map, &rbtree_fops);
> +#endif
What about introducing a debugfs_create_file() noop if debug-fs is not
compiled in?
Marc
>
> return 0;
>
--
Pengutronix e.K. | Marc Kleine-Budde |
Industrial Linux Solutions | Phone: +49-231-2826-924 |
Vertretung West/Dortmund | Fax: +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 262 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] regmap: Fix build failure with CONFIG_DEBUG_FS=n
2011-11-22 9:21 ` Marc Kleine-Budde
@ 2011-11-22 9:28 ` Uwe Kleine-König
0 siblings, 0 replies; 5+ messages in thread
From: Uwe Kleine-König @ 2011-11-22 9:28 UTC (permalink / raw)
To: Marc Kleine-Budde; +Cc: linux-kernel, kernel, Mark Brown
On Tue, Nov 22, 2011 at 10:21:22AM +0100, Marc Kleine-Budde wrote:
> On 11/22/2011 09:24 AM, Uwe Kleine-König wrote:
> > This fixes:
> >
> > drivers/base/regmap/regcache-rbtree.c: In function 'regcache_rbtree_init':
> > drivers/base/regmap/regcache-rbtree.c:197: error: 'struct regmap' has no member named 'debugfs'
> > drivers/base/regmap/regcache-rbtree.c:197: error: 'rbtree_fops' undeclared (first use in this function)
> > drivers/base/regmap/regcache-rbtree.c:197: error: (Each undeclared identifier is reported only once
> > drivers/base/regmap/regcache-rbtree.c:197: error: for each function it appears in.)
> >
> > which was introduced by commit
> >
> > bad2ab4 (regmap: Provide debugfs dump of the rbtree cache data)
> >
> > currently in next-20111122.
> >
> > Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
> > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> > ---
> > drivers/base/regmap/regcache-rbtree.c | 2 ++
> > 1 files changed, 2 insertions(+), 0 deletions(-)
> >
> > diff --git a/drivers/base/regmap/regcache-rbtree.c b/drivers/base/regmap/regcache-rbtree.c
> > index 7767cbb..270ad65 100644
> > --- a/drivers/base/regmap/regcache-rbtree.c
> > +++ b/drivers/base/regmap/regcache-rbtree.c
> > @@ -194,7 +194,9 @@ static int regcache_rbtree_init(struct regmap *map)
> > goto err;
> > }
> >
> > +#ifdef CONFIG_DEBUG_FS
> > debugfs_create_file("rbtree", 0400, map->debugfs, map, &rbtree_fops);
> > +#endif
>
> What about introducing a debugfs_create_file() noop if debug-fs is not
> compiled in?
There is one, but that doesn't help map->debugfs or rbtree_fops being
available. Ah, unless the debugfs_create_file stub would be a macro but
currently it's a static inline.
Best regards
Uwe
--
Pengutronix e.K. | Uwe Kleine-König |
Industrial Linux Solutions | http://www.pengutronix.de/ |
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] regmap: Fix build failure with CONFIG_DEBUG_FS=n
2011-11-22 8:24 [PATCH] regmap: Fix build failure with CONFIG_DEBUG_FS=n Uwe Kleine-König
2011-11-22 9:21 ` Marc Kleine-Budde
@ 2011-11-22 11:51 ` Mark Brown
2011-11-22 12:05 ` Marc Kleine-Budde
1 sibling, 1 reply; 5+ messages in thread
From: Mark Brown @ 2011-11-22 11:51 UTC (permalink / raw)
To: Uwe Kleine-K??nig; +Cc: linux-kernel, kernel
On Tue, Nov 22, 2011 at 09:24:20AM +0100, Uwe Kleine-K??nig wrote:
> This fixes:
Thanks for the report - I'm going to apply a different fix to cut down
the ifdefs.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] regmap: Fix build failure with CONFIG_DEBUG_FS=n
2011-11-22 11:51 ` Mark Brown
@ 2011-11-22 12:05 ` Marc Kleine-Budde
0 siblings, 0 replies; 5+ messages in thread
From: Marc Kleine-Budde @ 2011-11-22 12:05 UTC (permalink / raw)
To: Mark Brown; +Cc: Uwe Kleine-K??nig, linux-kernel, kernel
[-- Attachment #1: Type: text/plain, Size: 522 bytes --]
On 11/22/2011 12:51 PM, Mark Brown wrote:
> On Tue, Nov 22, 2011 at 09:24:20AM +0100, Uwe Kleine-K??nig wrote:
>> This fixes:
>
> Thanks for the report - I'm going to apply a different fix to cut down
> the ifdefs.
sounds good
Marc
--
Pengutronix e.K. | Marc Kleine-Budde |
Industrial Linux Solutions | Phone: +49-231-2826-924 |
Vertretung West/Dortmund | Fax: +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 262 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-11-22 12:06 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-22 8:24 [PATCH] regmap: Fix build failure with CONFIG_DEBUG_FS=n Uwe Kleine-König
2011-11-22 9:21 ` Marc Kleine-Budde
2011-11-22 9:28 ` Uwe Kleine-König
2011-11-22 11:51 ` Mark Brown
2011-11-22 12:05 ` Marc Kleine-Budde
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox