KEXEC_ALL_OPTIONS could be used instead defining the same
array several times. This makes code easier to maintain when
new options are added.

Suggested-by: Alexander Egorenkov <[email protected]>
Signed-off-by: Sven Schnelle <[email protected]>
Reviewed-by: Alexander Egorenkov <[email protected]>
---
 kexec/arch/s390/kexec-image.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/kexec/arch/s390/kexec-image.c b/kexec/arch/s390/kexec-image.c
index 7747d02399db..dbeb689b830a 100644
--- a/kexec/arch/s390/kexec-image.c
+++ b/kexec/arch/s390/kexec-image.c
@@ -58,10 +58,7 @@ int image_s390_load_file(int argc, char **argv, struct 
kexec_info *info)
 
        static const struct option options[] =
                {
-                       KEXEC_OPTIONS
-                       {"command-line",     1, 0, OPT_APPEND},
-                       {"append",           1, 0, OPT_APPEND},
-                       {"initrd",           1, 0, OPT_RAMDISK},
+                       KEXEC_ALL_OPTIONS
                        {0,                  0, 0, 0},
                };
        static const char short_options[] = KEXEC_OPT_STR "";
@@ -111,10 +108,7 @@ image_s390_load(int argc, char **argv, const char 
*kernel_buf,
 
        static const struct option options[] =
                {
-                       KEXEC_OPTIONS
-                       {"command-line",     1, 0, OPT_APPEND},
-                       {"append",           1, 0, OPT_APPEND},
-                       {"initrd",           1, 0, OPT_RAMDISK},
+                       KEXEC_ALL_OPTIONS
                        {0,                  0, 0, 0},
                };
        static const char short_options[] = KEXEC_OPT_STR "";
-- 
2.25.1


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

Reply via email to