From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from metis.ext.pengutronix.de ([2001:6f8:1178:4:290:27ff:fe1d:cc33]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UK3SX-0004AA-UE for barebox@lists.infradead.org; Mon, 25 Mar 2013 09:12:55 +0000 Date: Mon, 25 Mar 2013 10:12:47 +0100 From: Sascha Hauer Message-ID: <20130325091247.GW1906@pengutronix.de> References: <20130319154901.9111A25817@kryptos.localdomain> <20130319155432.GC16050@kryptos> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20130319155432.GC16050@kryptos> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: Re: [PATCH] macb: rename platform data To: Josh Cartwright Cc: barebox@lists.infradead.org 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 > > Date: Tue, 19 Mar 2013 10:22:48 -0500 > > Subject: [PATCH] parameter: fix build warning when !CONFIG_PARAMETER > > To: barebox@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 > > --- > > 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@lists.infradead.org > > http://lists.infradead.org/mailman/listinfo/barebox > > _______________________________________________ > barebox mailing list > barebox@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 | _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox