From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from eso.teric.us ([69.164.192.171]) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UHylJ-0000Xl-Pe for barebox@lists.infradead.org; Tue, 19 Mar 2013 15:47:42 +0000 Received: from kryptos.localdomain (neo.teric.us [198.58.100.135]) by eso.teric.us (Postfix) with ESMTPS id 4539910C81 for ; Tue, 19 Mar 2013 11:47:41 -0400 (EDT) Date: Tue, 19 Mar 2013 10:54:32 -0500 From: Josh Cartwright Message-ID: <20130319155432.GC16050@kryptos> References: <20130319154901.9111A25817@kryptos.localdomain> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20130319154901.9111A25817@kryptos.localdomain> 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: barebox@lists.infradead.org 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? > 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