Skip to contentSkip to conversation

kexec-tools: remove unused code from arch_process_options (arm, cris, ia64, mips, ppc)

PATCH Applied Matt Evans 2 participants 3 messages May 13, 2010

Subsystems (2)
lore
Share & tools
lore

Matt Evans

author
#0 lore raw

PATCH 1/1 kexec-tools: remove unused code from arch_process_options (arm, cris, ia64, mips, ppc)

These architectures don't have any architecture-specific options (note: distinct from loader options, which are more specific), yet their arch_process_options() functions contain getopts_long() calls followed by no argument processing. The code doesn't do anything, so this patch removes it.

---
 kexec/arch/arm/kexec-arm.c   |   17 -----------------
 kexec/arch/cris/kexec-cris.c |   17 -----------------
 kexec/arch/ia64/kexec-ia64.c |   21 +++------------------
 kexec/arch/mips/kexec-mips.c |   17 -----------------
 kexec/arch/ppc/kexec-ppc.c   |   17 -----------------
 5 files changed, 3 insertions(+), 86 deletions(-)
kexec/arch/arm/kexec-arm.c +0 -17
index 06ed8fd..de3f713 100644
@@ -88,23 +88,6 @@ void arch_usage(void)
 
 int arch_process_options(int argc, char **argv)
 {
-	static const struct option options[] = {
-		KEXEC_ARCH_OPTIONS
-		{ 0,			0, NULL, 0 },
-	};
-	static const char short_options[] = KEXEC_ARCH_OPT_STR;
-	int opt;
-
-	opterr = 0; /* Don't complain about unrecognized options here */
-	while((opt = getopt_long(argc, argv, short_options, options, 0)) != -1) {
-		switch(opt) {
-		default:
-			break;
-		}
-	}
-	/* Reset getopt for the next pass; called in other source modules */
-	opterr = 1;
-	optind = 1;
 	return 0;
 }
 
kexec/arch/cris/kexec-cris.c +0 -17
index 30df27e..38876f6 100644
@@ -54,23 +54,6 @@ void arch_usage(void)
 
 int arch_process_options(int argc, char **argv)
 {
-	static const struct option options[] = {
-		KEXEC_ARCH_OPTIONS
-		{ 0,                    0, NULL, 0 },
-	};
-	static const char short_options[] = KEXEC_ARCH_OPT_STR;
-	int opt;
-
-	opterr = 0; /* Don't complain about unrecognized options here */
-	while((opt = getopt_long(argc, argv, short_options, options, 0)) != -1) {
-		switch(opt) {
-		default:
-			break;
-		}
-	}
-	/* Reset getopt for the next pass; called in other source modules */
-	opterr = 1;
-	optind = 1;
 	return 0;
 }
 
kexec/arch/ia64/kexec-ia64.c +3 -18
index edd3674..aa510a9 100644
@@ -180,29 +180,14 @@ void arch_usage(void)
 
 int arch_process_options(int argc, char **argv)
 {
-	static const struct option options[] = {
-		KEXEC_ARCH_OPTIONS
-		{ 0, 0, NULL, 0 },
-	};
-	static const char short_options[] = KEXEC_ARCH_OPT_STR;
-	int opt;
+	/* This doesn't belong here!  Some sort of arch_init() ? */
 
 	/* execute from monarch processor */
-        cpu_set_t affinity;
+	cpu_set_t affinity;
 	CPU_ZERO(&affinity);
 	CPU_SET(0, &affinity);
-        sched_setaffinity(0, sizeof(affinity), &affinity);
+	sched_setaffinity(0, sizeof(affinity), &affinity);
 
-	opterr = 0; /* Don't complain about unrecognized options here */
-	while((opt = getopt_long(argc, argv, short_options, options, 0)) != -1) {
-		switch(opt) {
-		default:
-			break;
-		}
-	}
-	/* Reset getopt for the next pass; called in other source modules */
-	opterr = 1;
-	optind = 1;
 	return 0;
 }
 
kexec/arch/mips/kexec-mips.c +0 -17
index bd12bb3..fe0c945 100644
@@ -88,23 +88,6 @@ struct arch_options_t arch_options = {
 
 int arch_process_options(int argc, char **argv)
 {
-	static const struct option options[] = {
-		KEXEC_ARCH_OPTIONS
-		{ 0,                    0, NULL, 0 },
-	};
-	static const char short_options[] = KEXEC_ARCH_OPT_STR;
-	int opt;
-
-	opterr = 0; /* Don't complain about unrecognized options here */
-	while((opt = getopt_long(argc, argv, short_options, options, 0)) != -1) {
-		switch(opt) {
-		default:
-			break;
-		}
-	}
-	/* Reset getopt for the next pass; called in other source modules */
-	opterr = 1;
-	optind = 1;
 	return 0;
 }
 
kexec/arch/ppc/kexec-ppc.c +0 -17
index f552d79..effe94c 100644
@@ -495,23 +495,6 @@ void arch_usage(void)
 
 int arch_process_options(int argc, char **argv)
 {
-	static const struct option options[] = {
-		KEXEC_ARCH_OPTIONS
-		{ 0, 			0, NULL, 0 },
-	};
-	static const char short_options[] = KEXEC_ARCH_OPT_STR;
-	int opt;
-
-	opterr = 0; /* Don't complain about unrecognized options here */
-	while((opt = getopt_long(argc, argv, short_options, options, 0)) != -1) {
-		switch(opt) {
-		default:
-			break;
-		}
-	}
-	/* Reset getopt for the next pass; called in other source modules */
-	opterr = 1;
-	optind = 1;
 	return 0;
 }
 
Signature · 7 lines
1.6.3.3


_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
author
#1 lore raw
Quoted 6 lines · Matt Evans

These architectures don't have any architecture-specific options (note: distinct from loader options, which are more specific), yet their arch_process_options() functions contain getopts_long() calls followed by no argument processing. The code doesn't do anything, so this patch removes it.

Quoted 8 lines
---
 kexec/arch/arm/kexec-arm.c   |   17 -----------------
 kexec/arch/cris/kexec-cris.c |   17 -----------------
 kexec/arch/ia64/kexec-ia64.c |   21 +++------------------
 kexec/arch/mips/kexec-mips.c |   17 -----------------
 kexec/arch/ppc/kexec-ppc.c   |   17 -----------------
 5 files changed, 3 insertions(+), 86 deletions(-)

I forgot to add that unfortunately I have only been able to compile this patch on ppc. Since the code carefully removed doesn't have any effect I am hopeful for the rest... :-)

Cheers,

Matt

_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec

Applied
#2 lore raw
Quoted 16 lines · Matt Evans
Quoted 6 lines · Matt Evans

These architectures don't have any architecture-specific options (note: distinct from loader options, which are more specific), yet their arch_process_options() functions contain getopts_long() calls followed by no argument processing. The code doesn't do anything, so this patch removes it.

Quoted 8 lines
---
 kexec/arch/arm/kexec-arm.c   |   17 -----------------
 kexec/arch/cris/kexec-cris.c |   17 -----------------
 kexec/arch/ia64/kexec-ia64.c |   21 +++------------------
 kexec/arch/mips/kexec-mips.c |   17 -----------------
 kexec/arch/ppc/kexec-ppc.c   |   17 -----------------
 5 files changed, 3 insertions(+), 86 deletions(-)
Quoted 3 lines

I forgot to add that unfortunately I have only been able to compile this patch on ppc. Since the code carefully removed doesn't have any effect I am hopeful for the rest... :-)

Thanks, applied.

I successfully compiled the code for the other architectures with the exception of cris (as I don't have access to the box with that cross compiler at the moment).

_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec