From: Michal Suchanek <msuchanek@suse.de>
Date: Thu, 5 Sep 2024 14:47:15 +0000 (+0200)
Subject: depmod: Remove deprecated options
X-Git-Tag: v34~379
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=af54b73a80e8ea404f660dd58a61f61b491c7db8;p=thirdparty%2Fkmod.git

depmod: Remove deprecated options

These options are deprecated and undocumented since import of depmod
into git (Dec 2011).

Link: https://github.com/kmod-project/kmod/pull/100
Signed-off-by: Lucas De Marchi <lucas.de.marchi@gmail.com>
---

diff --git a/tools/depmod.c b/tools/depmod.c
index aa7331fc..d019bd82 100644
--- a/tools/depmod.c
+++ b/tools/depmod.c
@@ -49,7 +49,7 @@ static const char *const default_cfg_paths[] = {
 	// clang-format on
 };
 
-static const char cmdopts_s[] = "aAb:o:C:E:F:euqrvnP:wmVh";
+static const char cmdopts_s[] = "aAb:o:C:E:F:evnP:wVh";
 static const struct option cmdopts[] = {
 	{ "all", no_argument, 0, 'a' },
 	{ "quick", no_argument, 0, 'A' },
@@ -59,15 +59,11 @@ static const struct option cmdopts[] = {
 	{ "symvers", required_argument, 0, 'E' },
 	{ "filesyms", required_argument, 0, 'F' },
 	{ "errsyms", no_argument, 0, 'e' },
-	{ "unresolved-error", no_argument, 0, 'u' }, /* deprecated */
-	{ "quiet", no_argument, 0, 'q' }, /* deprecated */
-	{ "root", no_argument, 0, 'r' }, /* deprecated */
 	{ "verbose", no_argument, 0, 'v' },
 	{ "show", no_argument, 0, 'n' },
 	{ "dry-run", no_argument, 0, 'n' },
 	{ "symbol-prefix", required_argument, 0, 'P' },
 	{ "warn", no_argument, 0, 'w' },
-	{ "map", no_argument, 0, 'm' }, /* deprecated */
 	{ "version", no_argument, 0, 'V' },
 	{ "help", no_argument, 0, 'h' },
 	{ },
@@ -2990,17 +2986,6 @@ static int do_depmod(int argc, char *argv[])
 		case 'w':
 			cfg.warn_dups = 1;
 			break;
-		case 'u':
-		case 'q':
-		case 'r':
-		case 'm':
-			if (idx > 0)
-				WRN("Ignored deprecated option --%s\n",
-				    cmdopts[idx].name);
-			else
-				WRN("Ignored deprecated option -%c\n", c);
-
-			break;
 		case 'h':
 			help();
 			return EXIT_SUCCESS;