[PATCH] regmap: Fix build failure with CONFIG_DEBUG_FS=n

[PATCH] regmap: Fix build failure with CONFIG_DEBUG_FS=n

[Uwe Kleine-König]

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

Re: [PATCH] regmap: Fix build failure with CONFIG_DEBUG_FS=n

[Marc Kleine-Budde]

[-- 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 --]

Re: [PATCH] regmap: Fix build failure with CONFIG_DEBUG_FS=n

[Uwe Kleine-König]

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/  |

Re: [PATCH] regmap: Fix build failure with CONFIG_DEBUG_FS=n

[Mark Brown]

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.

Re: [PATCH] regmap: Fix build failure with CONFIG_DEBUG_FS=n

[Marc Kleine-Budde]

[-- 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 --]