From patchwork Wed Dec 22 13:08:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Leizhen (ThunderTown)" X-Patchwork-Id: 12697095 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id F0280C433EF for ; Wed, 22 Dec 2021 13:18:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:CC:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=lTZiG8qQw4xSCjRfvGlKDE2o5t3uiyZU6Lau3SfObt8=; b=zlaVi41D1CiJ8o zudPn7uspQrd6f4ODEgU3LetZP7/hTYprJQNfMd0j6mz+A/hyygqGrowW8k6Y25M4KbFhJPyg5tQW shBANxEXcB7YsdOzmSZpq+dJHaW1zmLARP2B96L0cS18c+U7Yl+MhoMM7PTPCZuqd9g00mQnv6Ihy Nfmj+bMyIKis1bdY3G0aevhHvjEpfqVMNrpjJ/+bORDWVMHwlskZv/HbiS0qhc9NDVgbhs3PS8j+5 Rwd+eHPMscsK5otwfZAYm4CNLZMfv4mcMYdO/2fh860U8QLRMh5M2chwYIL4NnKVvsVcFzAHzoive 6xEHaQJme6Ax0t1E4cjA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1n01U5-00ARe2-T6; Wed, 22 Dec 2021 13:16:46 +0000 Received: from szxga01-in.huawei.com ([45.249.212.187]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1n01Py-00APHf-Is; Wed, 22 Dec 2021 13:12:33 +0000 Received: from dggpemm500021.china.huawei.com (unknown [172.30.72.53]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4JJtvM4003zZdj9; Wed, 22 Dec 2021 21:09:19 +0800 (CST) Received: from dggpemm500006.china.huawei.com (7.185.36.236) by dggpemm500021.china.huawei.com (7.185.36.109) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20; Wed, 22 Dec 2021 21:12:28 +0800 Received: from thunder-town.china.huawei.com (10.174.178.55) by dggpemm500006.china.huawei.com (7.185.36.236) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20; Wed, 22 Dec 2021 21:12:27 +0800 From: Zhen Lei To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , , "H . Peter Anvin" , , Dave Young , Baoquan He , Vivek Goyal , Eric Biederman , , Catalin Marinas , "Will Deacon" , , Rob Herring , Frank Rowand , , Jonathan Corbet , CC: Zhen Lei , Randy Dunlap , Feng Zhou , Kefeng Wang , Chen Zhou , "John Donnelly" Subject: [PATCH v18 10/17] kdump: Simplify the parameters of __parse_crashkernel() Date: Wed, 22 Dec 2021 21:08:13 +0800 Message-ID: <20211222130820.1754-11-thunder.leizhen@huawei.com> X-Mailer: git-send-email 2.26.0.windows.1 In-Reply-To: <20211222130820.1754-1-thunder.leizhen@huawei.com> References: <20211222130820.1754-1-thunder.leizhen@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.174.178.55] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To dggpemm500006.china.huawei.com (7.185.36.236) X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211222_051231_039550_EC66AF5E X-CRM114-Status: GOOD ( 12.99 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org After commit adbc742bf786 ("x86, kdump: Change crashkernel_high/low= to crashkernel=,high/low"), all kdump bootup parameters start with "crashkernel=". Therefore, it is better for __parse_crashkernel() to use it directly than for the caller to pass it. So the parameter 'name' can be omitted. Similarly, we can pass the suffix type instead of the suffix name to avoid the global variable 'suffix_tbl' appearing in multiple places. There is no change in functionality, but it makes the code look a little more concise. Signed-off-by: Zhen Lei --- kernel/crash_core.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/kernel/crash_core.c b/kernel/crash_core.c index 64ed082382f3f18..496dae2718cf026 100644 --- a/kernel/crash_core.c +++ b/kernel/crash_core.c @@ -233,11 +233,12 @@ static int __init __parse_crashkernel(char *cmdline, unsigned long long system_ram, unsigned long long *crash_size, unsigned long long *crash_base, - const char *name, - const char *suffix) + int suffix_type) { char *first_colon, *first_space; char *ck_cmdline; + const char *name = "crashkernel="; + const char *suffix = suffix_tbl[suffix_type]; BUG_ON(!crash_size || !crash_base); *crash_size = 0; @@ -275,8 +276,7 @@ int __init parse_crashkernel(char *cmdline, unsigned long long *crash_size, unsigned long long *crash_base) { - return __parse_crashkernel(cmdline, system_ram, crash_size, crash_base, - "crashkernel=", NULL); + return __parse_crashkernel(cmdline, system_ram, crash_size, crash_base, SUFFIX_NULL); } int __init parse_crashkernel_high(char *cmdline, @@ -284,8 +284,7 @@ int __init parse_crashkernel_high(char *cmdline, unsigned long long *crash_size, unsigned long long *crash_base) { - return __parse_crashkernel(cmdline, system_ram, crash_size, crash_base, - "crashkernel=", suffix_tbl[SUFFIX_HIGH]); + return __parse_crashkernel(cmdline, system_ram, crash_size, crash_base, SUFFIX_HIGH); } int __init parse_crashkernel_low(char *cmdline, @@ -293,8 +292,7 @@ int __init parse_crashkernel_low(char *cmdline, unsigned long long *crash_size, unsigned long long *crash_base) { - return __parse_crashkernel(cmdline, system_ram, crash_size, crash_base, - "crashkernel=", suffix_tbl[SUFFIX_LOW]); + return __parse_crashkernel(cmdline, system_ram, crash_size, crash_base, SUFFIX_LOW); } /*