From: Matt Evans <matt@ozlabs.org>
To: kexec@lists.infradead.org
Cc: horms@verge.net.au
Subject: [PATCH] kexec-tools: remove unused code from arch_process_options (arm, cris, ia64, mips, ppc)
Date: Thu, 13 May 2010 17:33:59 +1000 [thread overview]
Message-ID: <4BEBAB67.30107@ozlabs.org> (raw)
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.
Signed-off-by: Matt Evans <matt@ozlabs.org>
---
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(-)
diff --git a/kexec/arch/arm/kexec-arm.c b/kexec/arch/arm/kexec-arm.c
index 06ed8fd..de3f713 100644
--- a/kexec/arch/arm/kexec-arm.c
+++ b/kexec/arch/arm/kexec-arm.c
@@ -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;
}
diff --git a/kexec/arch/cris/kexec-cris.c b/kexec/arch/cris/kexec-cris.c
index 30df27e..38876f6 100644
--- a/kexec/arch/cris/kexec-cris.c
+++ b/kexec/arch/cris/kexec-cris.c
@@ -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;
}
diff --git a/kexec/arch/ia64/kexec-ia64.c b/kexec/arch/ia64/kexec-ia64.c
index edd3674..aa510a9 100644
--- a/kexec/arch/ia64/kexec-ia64.c
+++ b/kexec/arch/ia64/kexec-ia64.c
@@ -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;
}
diff --git a/kexec/arch/mips/kexec-mips.c b/kexec/arch/mips/kexec-mips.c
index bd12bb3..fe0c945 100644
--- a/kexec/arch/mips/kexec-mips.c
+++ b/kexec/arch/mips/kexec-mips.c
@@ -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;
}
diff --git a/kexec/arch/ppc/kexec-ppc.c b/kexec/arch/ppc/kexec-ppc.c
index f552d79..effe94c 100644
--- a/kexec/arch/ppc/kexec-ppc.c
+++ b/kexec/arch/ppc/kexec-ppc.c
@@ -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;
}
--
1.6.3.3
_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec
next reply other threads:[~2010-05-13 7:34 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-13 7:33 Matt Evans [this message]
2010-05-13 7:50 ` [PATCH] kexec-tools: remove unused code from arch_process_options (arm, cris, ia64, mips, ppc) Matt Evans
2010-05-13 14:29 ` Simon Horman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4BEBAB67.30107@ozlabs.org \
--to=matt@ozlabs.org \
--cc=horms@verge.net.au \
--cc=kexec@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox