Patchwork [09/10] mtdinfo: kill -m option

login
register
mail settings
Submitter Artem Bityutskiy
Date June 29, 2011, 6:02 a.m.
Message ID <1309327350.23597.96.camel@sauron>
Download mbox | patch
Permalink /patch/102517/
State New
Headers show

Comments

Artem Bityutskiy - June 29, 2011, 6:02 a.m.
On Mon, 2011-06-27 at 11:27 -0700, Brian Norris wrote:
> According to feature-removal-schedule, we shouldn't use `-m', since
> it relies on a specific device-naming pattern.
> 
> Signed-off-by: Brian Norris <computersforpeace@gmail.com>
> ---
>  feature-removal-schedule.txt |    8 --------
>  ubi-utils/mtdinfo.c          |   25 ++++++-------------------
>  2 files changed, 6 insertions(+), 27 deletions(-)

Pushed the series, thanks! I would also like to add the following patch
on top of your series, is ok with you?

From: Artem Bityutskiy <dedekind1@gmail.com>
Date: Wed, 29 Jun 2011 08:56:39 +0300
Subject: [PATCH] mtdinfo: remove -m leftovers

We have removed the -m option, but did not remove args.mtdn which represents
the -m parameters. Kill args.mtdn as well.

Signed-off-by: Artem Bityutskiy <dedekind1@gmail.com>
---
 ubi-utils/mtdinfo.c |   22 +++++++++-------------
 1 files changed, 9 insertions(+), 13 deletions(-)

Patch

diff --git a/ubi-utils/mtdinfo.c b/ubi-utils/mtdinfo.c
index dd5da53..4631f37 100644
--- a/ubi-utils/mtdinfo.c
+++ b/ubi-utils/mtdinfo.c
@@ -128,10 +128,8 @@  static int parse_opt(int argc, char * const argv[])
 	else if (optind < argc)
 		return errmsg("more then one MTD device specified (use -h for help)");
 
-	if (args.all && (args.node || args.mtdn != -1)) {
-		args.mtdn = -1;
+	if (args.all && args.node)
 		args.node = NULL;
-	}
 
 	if (args.map && !args.node)
 		return errmsg("-M requires MTD device node name");
@@ -153,8 +151,7 @@  static int translate_dev(libmtd_t libmtd, const char *node)
 				  "device \"%s\"", node);
 	}
 
-	args.mtdn = mtd.mtd_num;
-	return 0;
+	return mtd.mtd_num;
 }
 
 static void print_ubi_info(const struct mtd_info *mtd_info,
@@ -406,20 +403,19 @@  int main(int argc, char * const argv[])
 		return sys_errmsg("cannot get MTD information");
 	}
 
-	if (args.node) {
+	if (!args.all) {
+		int mtdn;
+
 		/*
 		 * A character device was specified, translate this to MTD
 		 * device number.
 		 */
-		err = translate_dev(libmtd, args.node);
-		if (err)
+		mtdn = translate_dev(libmtd, args.node);
+		if (mtdn < 0)
 			goto out_libmtd;
-	}
-
-	if (args.mtdn == -1)
+		err = print_dev_info(libmtd, &mtd_info, mtdn);
+	} else
 		err = print_general_info(libmtd, &mtd_info, args.all);
-	else
-		err = print_dev_info(libmtd, &mtd_info, args.mtdn);
 	if (err)
 		goto out_libmtd;