On Tuesday 01 June 2010 22:23:44 Ben Gardiner wrote: > The get_mtd_device_nm function is called in a couple places and the string > that is passed to it is not really used after the calls. > > This patch regroups the calls to this function into a new function, > get_mtd_info.
Thanks. Some nitpicking comments below. > Signed-off-by: Ben Gardiner <[email protected]> > --- > common/cmd_mtdparts.c | 43 ++++++++++++++++++++++++++++--------------- > 1 files changed, 28 insertions(+), 15 deletions(-) > > diff --git a/common/cmd_mtdparts.c b/common/cmd_mtdparts.c > index 116e637..7a9768f 100644 > --- a/common/cmd_mtdparts.c > +++ b/common/cmd_mtdparts.c > @@ -286,6 +286,27 @@ static void current_save(void) > index_partitions(); > } > > + > +/** Produce a mtd_info given a type and num > + * @param type mtd type > + * @param num mtd number > + * @param mtd a pointer to an mtd_info instance (output) > + * @return 0 if device is valid, 1 otherwise > + */ > +static int get_mtd_info(u8 type, u8 num, struct mtd_info **mtd) > +{ > + char mtd_dev[16]; > + > + sprintf(mtd_dev, "%s%d", MTD_DEV_TYPE(type), num); > + *mtd = get_mtd_device_nm(mtd_dev); > + if (IS_ERR(*mtd)) { > + printf("Device %s not found!\n", mtd_dev); > + return 1; > + } > + > + return 0; > +} > + > /** > * Performs sanity check for supplied flash partition. > * Table of existing MTD flash devices is searched and partition device > @@ -297,17 +318,12 @@ static void current_save(void) > */ > static int part_validate_eraseblock(struct mtdids *id, struct part_info > *part) { > - struct mtd_info *mtd; > - char mtd_dev[16]; > + struct mtd_info *mtd = NULL; > int i, j; > ulong start; > > - sprintf(mtd_dev, "%s%d", MTD_DEV_TYPE(id->type), id->num); > - mtd = get_mtd_device_nm(mtd_dev); > - if (IS_ERR(mtd)) { > - printf("Partition %s not found on device %s!\n", part->name, mtd_dev); > + if(get_mtd_info(id->type, id->num, &mtd)) Space after "if" please. > return 1; > - } > > part->sector_size = mtd->erasesize; > > @@ -684,20 +700,17 @@ static int part_parse(const char *const partdef, > const char **ret, struct part_i /** > * Check device number to be within valid range for given device type. > * > - * @param dev device to validate > + * @param type mtd type > + * @param num mtd number > + * @param size a pointer to the size of the mtd device (output) > * @return 0 if device is valid, 1 otherwise > */ > int mtd_device_validate(u8 type, u8 num, u32 *size) > { > - struct mtd_info *mtd; > - char mtd_dev[16]; > + struct mtd_info *mtd = NULL; > > - sprintf(mtd_dev, "%s%d", MTD_DEV_TYPE(type), num); > - mtd = get_mtd_device_nm(mtd_dev); > - if (IS_ERR(mtd)) { > - printf("Device %s not found!\n", mtd_dev); > + if(get_mtd_info(type, num, &mtd)) Again, space after "if". Please respin this patch and add my: Acked-by: Stefan Roese <[email protected]> Thanks. Cheers, Stefan -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-0 Fax: (+49)-8142-66989-80 Email: [email protected] _______________________________________________ U-Boot mailing list [email protected] http://lists.denx.de/mailman/listinfo/u-boot
