[PATCH] macb: rename platform data

[Sascha Hauer]

Hi Josh,

On Tue, Mar 19, 2013 at 10:54:32AM -0500, Josh Cartwright wrote:
> On Fri, Mar 15, 2013 at 06:26:00PM -0500, Josh Cartwright wrote:
> [..]
> > >From 0d51dc731ff3934e22e78405a992658a8d3bf1de Mon Sep 17 00:00:00 2001
> > From: Josh Cartwright <joshc at eso.teric.us>
> > Date: Tue, 19 Mar 2013 10:22:48 -0500
> > Subject: [PATCH] parameter: fix build warning when !CONFIG_PARAMETER
> > To: barebox at lists.infradead.org
> 
> Ugh, sorry that I butchered patch submission and this mail ended up with
> two patches together; should I resend?

No, it's ok. I applied the macb pdata rename. If you wish to have the
other one applied, please resend this one.

Sascha

> 
> > Commit 51f2ded17c35c146488f6f3b697764bb2953a156 ("param: make return
> > value of param getter function const") made the parameter getter const,
> > but neglected to change the dev_add_param() function prototype in the
> > !CONFIG_PARAMETER case.
> > 
> > Fixes the following warning with CONFIG_NAND and !CONFIG_PARAMETER:
> > 
> > drivers/mtd/nand/nand_base.c: In function 'add_mtd_nand_device':
> > drivers/mtd/nand/nand_base.c:1720:2: warning: passing argument 4 of 'dev_add_param' from incompatible pointer type [enabled by default]
> > include/param.h:59:19: note: expected 'char * (*)(struct device_d *, struct param_d *)' but argument is of type 'const char * (*)(struct device_d *, struct param_d *)'
> > 
> > Signed-off-by: Josh Cartwright <joshc at eso.teric.us>
> > ---
> >  include/param.h | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/include/param.h b/include/param.h
> > index 21f4f7d..3a585cd 100644
> > --- a/include/param.h
> > +++ b/include/param.h
> > @@ -58,7 +58,7 @@ static inline struct param_d *get_param_by_name(struct device_d *dev,
> >  
> >  static inline int dev_add_param(struct device_d *dev, char *name,
> >  		int (*set)(struct device_d *dev, struct param_d *p, const char *val),
> > -		char *(*get)(struct device_d *, struct param_d *p),
> > +		const char *(*get)(struct device_d *, struct param_d *p),
> >  		unsigned long flags)
> >  {
> >  	return 0;
> > -- 
> > 1.8.1.5
> > 
> > 
> > _______________________________________________
> > barebox mailing list
> > barebox at lists.infradead.org
> > http://lists.infradead.org/mailman/listinfo/barebox
> 
> _______________________________________________
> barebox mailing list
> barebox at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |