From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mp3Wp-00F3sK-Ii for kexec@lists.infradead.org; Mon, 22 Nov 2021 07:14:17 +0000 From: Sven Schnelle Subject: [PATCH 2/3] s390: use KEXEC_ALL_OPTIONS Date: Mon, 22 Nov 2021 08:14:00 +0100 Message-Id: <20211122071401.3106858-3-svens@linux.ibm.com> In-Reply-To: <20211122071401.3106858-1-svens@linux.ibm.com> References: <20211122071401.3106858-1-svens@linux.ibm.com> MIME-Version: 1.0 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "kexec" Errors-To: kexec-bounces+dwmw2=infradead.org@lists.infradead.org To: Simon Horman Cc: kexec@lists.infradead.org, Sven Schnelle , Alexander Egorenkov 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 Signed-off-by: Sven Schnelle Reviewed-by: Alexander Egorenkov --- 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 kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec