nanddump: remove --skipbad, leaving --bb=skipbad

We are moving to unify bad block handling methods under the --bb=METHOD
option. Since --skipbad has not been included in a mtd-utils release yet,
we can safely replace it without a deprecation and phase-out period.

Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Signed-off-by: Artem Bityutskiy <dedekind1@gmail.com>

diff --git a/nanddump.c b/nanddump.c
index 08f896457a4c2eb7c0c0a73e91d8d66987afc5e0..d2e2e8f1fe6e08bc0dd8e3d62811154cfb2f2300 100644 (file)
--- a/nanddump.c
+++ b/nanddump.c
@@ -51,7 +51,6 @@ static void display_help(void)
 "-b         --omitbad            Omit bad blocks from the dump\n"
 "-c         --canonicalprint     Print canonical Hex+ASCII dump\n"
 "-f file    --file=file          Dump to file\n"
-"-k         --skipbad            Skip over bad blocks (see below)\n"
 "-l length  --length=length      Length\n"
 "-n         --noecc              Read without error correction\n"
 "-N         --noskipbad          Read without bad block skipping\n"
@@ -111,7 +110,7 @@ static void process_options(int argc, char * const argv[])
 
        for (;;) {
                int option_index = 0;
-               static const char *short_options = "bs:f:l:opqnNcak";
+               static const char *short_options = "bs:f:l:opqnNca";
                static const struct option long_options[] = {
                        {"help", no_argument, 0, 0},
                        {"version", no_argument, 0, 0},
@@ -126,7 +125,6 @@ static void process_options(int argc, char * const argv[])
                        {"length", required_argument, 0, 'l'},
                        {"noecc", no_argument, 0, 'n'},
                        {"noskipbad", no_argument, 0, 'N'},
-                       {"skipbad", no_argument, 0, 'k'},
                        {"quiet", no_argument, 0, 'q'},
                        {0, 0, 0, 0},
                };
@@ -207,15 +205,6 @@ static void process_options(int argc, char * const argv[])
                                        error++;
                                }
                                break;
-                       case 'k':
-                               /* Check if bb_method was already set explicitly */
-                               if (bb_default) {
-                                       bb_default = false;
-                                       bb_method = skipbad;
-                               } else {
-                                       error++;
-                               }
-                               break;
                        case '?':
                                error++;
                                break;