9
0
Fork 0

parameter: fix build warning when !CONFIG_PARAMETER

Commit 51f2ded17c ("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@eso.teric.us>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Josh Cartwright 2013-03-19 10:22:48 -05:00 committed by Sascha Hauer
parent 5b856e44fb
commit 74406ae9ad
1 changed files with 1 additions and 1 deletions

View File

@ -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;