From: Yisheng Xie <xieyisheng1@huawei.com> To: Andy Shevchenko <andy.shevchenko@gmail.com> Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, "David S. Miller" <davem@davemloft.net>, Anthony Yznaga <anthony.yznaga@oracle.com>, Pavel Tatashin <pasha.tatashin@oracle.com>, <sparclinux@vger.kernel.org>, Kefeng Wang <wangkefeng.wang@huawei.com> Subject: [PATCH v4 21/21] sparc64: use match_string() helper Date: Thu, 21 Jun 2018 09:39:28 +0800 [thread overview] Message-ID: <29324e04-e6c3-188c-a7fa-0363305b6455@huawei.com> (raw) In-Reply-To: <CAHp75VdvpxZCuGmFV0r9nUdO1u7=eurDFZur7Q=ZO0kMC6D0rw@mail.gmail.com> match_string() returns the index of an array for a matching string, which can be used instead of open coded variant. As Andy's suggestion, this patch add string literal instead of NULL for crypto in array of hwcaps and make an additional condition after match_string() in all users of it. Cc: "David S. Miller" <davem@davemloft.net> Cc: Anthony Yznaga <anthony.yznaga@oracle.com> Cc: Pavel Tatashin <pasha.tatashin@oracle.com> Cc: sparclinux@vger.kernel.org Signed-off-by: Yisheng Xie <xieyisheng1@huawei.com> --- arch/sparc/kernel/setup_64.c | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/arch/sparc/kernel/setup_64.c b/arch/sparc/kernel/setup_64.c index 7944b3c..6fa0c78 100644 --- a/arch/sparc/kernel/setup_64.c +++ b/arch/sparc/kernel/setup_64.c @@ -401,8 +401,7 @@ void __init start_early_boot(void) */ "mul32", "div32", "fsmuld", "v8plus", "popc", "vis", "vis2", "ASIBlkInit", "fmaf", "vis3", "hpc", "random", "trans", "fjfmau", - "ima", "cspare", "pause", "cbcond", NULL /*reserved for crypto */, - "adp", + "ima", "cspare", "pause", "cbcond", "crypto", "adp", }; static const char *crypto_hwcaps[] = { @@ -418,7 +417,7 @@ void cpucap_info(struct seq_file *m) seq_puts(m, "cpucaps\t\t: "); for (i = 0; i < ARRAY_SIZE(hwcaps); i++) { unsigned long bit = 1UL << i; - if (hwcaps[i] && (caps & bit)) { + if ((caps & bit) && bit != HWCAP_SPARC_CRYPTO) { seq_printf(m, "%s%s", printed ? "," : "", hwcaps[i]); printed++; @@ -472,7 +471,7 @@ static void __init report_hwcaps(unsigned long caps) for (i = 0; i < ARRAY_SIZE(hwcaps); i++) { unsigned long bit = 1UL << i; - if (hwcaps[i] && (caps & bit)) + if ((caps & bit) && bit != HWCAP_SPARC_CRYPTO) report_one_hwcap(&printed, hwcaps[i]); } if (caps & HWCAP_SPARC_CRYPTO) @@ -504,18 +503,13 @@ static unsigned long __init mdesc_cpu_hwcap_list(void) while (len) { int i, plen; - for (i = 0; i < ARRAY_SIZE(hwcaps); i++) { - unsigned long bit = 1UL << i; + i = match_string(hwcaps, ARRAY_SIZE(hwcaps), prop); + if (i >= 0) + caps |= 1UL << i; - if (hwcaps[i] && !strcmp(prop, hwcaps[i])) { - caps |= bit; - break; - } - } - for (i = 0; i < ARRAY_SIZE(crypto_hwcaps); i++) { - if (!strcmp(prop, crypto_hwcaps[i])) - caps |= HWCAP_SPARC_CRYPTO; - } + i = match_string(crypto_hwcaps, ARRAY_SIZE(crypto_hwcaps), prop); + if (i >= 0) + caps |= HWCAP_SPARC_CRYPTO; plen = strlen(prop) + 1; prop += plen; -- 1.7.12.4
WARNING: multiple messages have this Message-ID (diff)
From: Yisheng Xie <xieyisheng1@huawei.com> To: Andy Shevchenko <andy.shevchenko@gmail.com> Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, "David S. Miller" <davem@davemloft.net>, Anthony Yznaga <anthony.yznaga@oracle.com>, Pavel Tatashin <pasha.tatashin@oracle.com>, sparclinux@vger.kernel.org, Kefeng Wang <wangkefeng.wang@huawei.com> Subject: [PATCH v4 21/21] sparc64: use match_string() helper Date: Thu, 21 Jun 2018 01:39:28 +0000 [thread overview] Message-ID: <29324e04-e6c3-188c-a7fa-0363305b6455@huawei.com> (raw) In-Reply-To: <CAHp75VdvpxZCuGmFV0r9nUdO1u7=eurDFZur7Q=ZO0kMC6D0rw@mail.gmail.com> match_string() returns the index of an array for a matching string, which can be used instead of open coded variant. As Andy's suggestion, this patch add string literal instead of NULL for crypto in array of hwcaps and make an additional condition after match_string() in all users of it. Cc: "David S. Miller" <davem@davemloft.net> Cc: Anthony Yznaga <anthony.yznaga@oracle.com> Cc: Pavel Tatashin <pasha.tatashin@oracle.com> Cc: sparclinux@vger.kernel.org Signed-off-by: Yisheng Xie <xieyisheng1@huawei.com> --- arch/sparc/kernel/setup_64.c | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/arch/sparc/kernel/setup_64.c b/arch/sparc/kernel/setup_64.c index 7944b3c..6fa0c78 100644 --- a/arch/sparc/kernel/setup_64.c +++ b/arch/sparc/kernel/setup_64.c @@ -401,8 +401,7 @@ void __init start_early_boot(void) */ "mul32", "div32", "fsmuld", "v8plus", "popc", "vis", "vis2", "ASIBlkInit", "fmaf", "vis3", "hpc", "random", "trans", "fjfmau", - "ima", "cspare", "pause", "cbcond", NULL /*reserved for crypto */, - "adp", + "ima", "cspare", "pause", "cbcond", "crypto", "adp", }; static const char *crypto_hwcaps[] = { @@ -418,7 +417,7 @@ void cpucap_info(struct seq_file *m) seq_puts(m, "cpucaps\t\t: "); for (i = 0; i < ARRAY_SIZE(hwcaps); i++) { unsigned long bit = 1UL << i; - if (hwcaps[i] && (caps & bit)) { + if ((caps & bit) && bit != HWCAP_SPARC_CRYPTO) { seq_printf(m, "%s%s", printed ? "," : "", hwcaps[i]); printed++; @@ -472,7 +471,7 @@ static void __init report_hwcaps(unsigned long caps) for (i = 0; i < ARRAY_SIZE(hwcaps); i++) { unsigned long bit = 1UL << i; - if (hwcaps[i] && (caps & bit)) + if ((caps & bit) && bit != HWCAP_SPARC_CRYPTO) report_one_hwcap(&printed, hwcaps[i]); } if (caps & HWCAP_SPARC_CRYPTO) @@ -504,18 +503,13 @@ static unsigned long __init mdesc_cpu_hwcap_list(void) while (len) { int i, plen; - for (i = 0; i < ARRAY_SIZE(hwcaps); i++) { - unsigned long bit = 1UL << i; + i = match_string(hwcaps, ARRAY_SIZE(hwcaps), prop); + if (i >= 0) + caps |= 1UL << i; - if (hwcaps[i] && !strcmp(prop, hwcaps[i])) { - caps |= bit; - break; - } - } - for (i = 0; i < ARRAY_SIZE(crypto_hwcaps); i++) { - if (!strcmp(prop, crypto_hwcaps[i])) - caps |= HWCAP_SPARC_CRYPTO; - } + i = match_string(crypto_hwcaps, ARRAY_SIZE(crypto_hwcaps), prop); + if (i >= 0) + caps |= HWCAP_SPARC_CRYPTO; plen = strlen(prop) + 1; prop += plen; -- 1.7.12.4
next prev parent reply other threads:[~2018-06-21 1:40 UTC|newest] Thread overview: 113+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-05-31 11:11 [PATCH v2 00/21] use match_string() helper Yisheng Xie 2018-05-31 11:11 ` [PATCH v2 01/21] usb: phy: " Yisheng Xie 2018-05-31 11:11 ` [v2,01/21] " Xie Yisheng 2018-05-31 16:55 ` [PATCH v2 01/21] " Sergei Shtylyov 2018-05-31 16:55 ` [v2,01/21] " Sergei Shtylyov 2018-05-31 18:47 ` [PATCH v2 01/21] " Andy Shevchenko 2018-05-31 18:47 ` [v2,01/21] " Andy Shevchenko 2018-05-31 18:56 ` [PATCH v2 01/21] " Sergei Shtylyov 2018-05-31 18:56 ` [v2,01/21] " Sergei Shtylyov 2018-05-31 18:59 ` [PATCH v2 01/21] " Andy Shevchenko 2018-05-31 18:59 ` [v2,01/21] " Andy Shevchenko 2018-06-05 9:28 ` [PATCH v2 01/21] " Yisheng Xie 2018-06-05 9:28 ` [v2,01/21] " Xie Yisheng 2018-05-31 11:11 ` [PATCH v2 02/21] mfd: omap-usb-host: " Yisheng Xie 2018-05-31 11:11 ` Yisheng Xie 2018-06-04 7:44 ` Lee Jones 2018-06-04 8:13 ` Yisheng Xie 2018-06-04 8:13 ` Yisheng Xie 2018-05-31 11:11 ` [PATCH v2 03/21] Staging: gdm724x: " Yisheng Xie 2018-05-31 11:44 ` Greg Kroah-Hartman 2018-05-31 12:12 ` Yisheng Xie 2018-06-06 2:21 ` [PATCH v3 " Yisheng Xie 2018-05-31 11:11 ` [PATCH v2 04/21] cxgb4: " Yisheng Xie 2018-06-05 13:19 ` Andy Shevchenko 2018-05-31 11:11 ` [PATCH v2 05/21] hp100: " Yisheng Xie 2018-05-31 11:11 ` [PATCH v2 06/21] iwlwifi: mvm: " Yisheng Xie 2018-06-05 13:19 ` Andy Shevchenko 2018-05-31 11:11 ` [PATCH v2 07/21] bus: fsl-mc: " Yisheng Xie 2018-05-31 11:11 ` [PATCH v2 08/21] clk: bcm2835: " Yisheng Xie 2018-05-31 11:11 ` Yisheng Xie 2018-06-02 6:17 ` Stephen Boyd 2018-06-02 6:17 ` Stephen Boyd 2018-06-02 6:17 ` Stephen Boyd 2018-05-31 11:11 ` [PATCH v2 09/21] clk: " Yisheng Xie 2018-06-02 6:17 ` Stephen Boyd 2018-06-02 6:17 ` Stephen Boyd 2018-05-31 11:11 ` [PATCH v2 10/21] cpufreq: intel_pstate: " Yisheng Xie 2018-05-31 11:11 ` Yisheng Xie 2018-06-26 15:23 ` Rafael J. Wysocki 2018-06-26 23:56 ` Srinivas Pandruvada 2018-07-04 10:52 ` Rafael J. Wysocki 2018-05-31 11:11 ` [PATCH v2 11/21] drm/nouveau: " Yisheng Xie 2018-05-31 11:11 ` Yisheng Xie 2018-06-05 13:20 ` Andy Shevchenko 2018-06-05 13:20 ` Andy Shevchenko 2018-05-31 11:11 ` [PATCH v2 12/21] drm: i2c: ch7006: " Yisheng Xie 2018-05-31 11:11 ` Yisheng Xie 2018-06-05 13:21 ` Andy Shevchenko 2018-05-31 11:11 ` [PATCH v2 13/21] ima: " Yisheng Xie 2018-05-31 11:11 ` Yisheng Xie 2018-05-31 15:02 ` Mimi Zohar 2018-05-31 15:02 ` Mimi Zohar 2018-06-01 10:55 ` Andy Shevchenko 2018-06-01 10:55 ` Andy Shevchenko 2018-05-31 11:11 ` [PATCH v2 14/21] sched/debug: " Yisheng Xie 2018-06-05 13:21 ` Andy Shevchenko 2018-05-31 11:11 ` [PATCH v2 15/21] ALSA: oxygen: " Yisheng Xie 2018-05-31 11:11 ` Yisheng Xie 2018-05-31 18:39 ` Takashi Iwai 2018-05-31 18:39 ` Takashi Iwai 2018-05-31 18:40 ` Andy Shevchenko 2018-05-31 18:43 ` Takashi Iwai 2018-05-31 18:43 ` Takashi Iwai 2018-05-31 18:44 ` Andy Shevchenko 2018-05-31 18:41 ` Andy Shevchenko 2018-05-31 18:59 ` Takashi Iwai 2018-05-31 19:02 ` Andy Shevchenko 2018-05-31 20:30 ` Takashi Iwai 2018-05-31 11:11 ` [PATCH v2 16/21] ASoC: max98088: " Yisheng Xie 2018-05-31 11:11 ` Yisheng Xie 2018-05-31 11:49 ` Mark Brown 2018-05-31 12:25 ` Yisheng Xie 2018-05-31 12:25 ` Yisheng Xie 2018-05-31 16:02 ` Mark Brown 2018-06-01 0:38 ` Yisheng Xie 2018-06-01 0:38 ` Yisheng Xie 2018-05-31 16:09 ` Applied "ASoC: max98088: use match_string() helper" to the asoc tree Mark Brown 2018-05-31 16:09 ` Mark Brown 2018-05-31 11:11 ` [PATCH v2 17/21] ASoC: max98095: use match_string() helper Yisheng Xie 2018-05-31 11:11 ` Yisheng Xie 2018-05-31 16:09 ` Applied "ASoC: max98095: use match_string() helper" to the asoc tree Mark Brown 2018-05-31 16:09 ` Mark Brown 2018-05-31 11:11 ` [PATCH v2 18/21] ASoC: dapm: use match_string() helper Yisheng Xie 2018-05-31 11:11 ` Yisheng Xie 2018-05-31 11:11 ` [PATCH v2 19/21] bcache: " Yisheng Xie 2018-05-31 11:11 ` Yisheng Xie 2018-06-01 3:45 ` Coly Li 2018-06-01 4:32 ` Yisheng Xie 2018-06-01 4:32 ` Yisheng Xie 2018-06-01 5:04 ` Coly Li 2018-05-31 11:11 ` [PATCH v2 20/21] powerpc/xmon: " Yisheng Xie 2018-06-04 14:11 ` [v2,20/21] " Michael Ellerman 2018-05-31 11:11 ` [PATCH v2 21/21] sparc64: " Yisheng Xie 2018-05-31 11:11 ` Yisheng Xie 2018-06-01 11:34 ` Andy Shevchenko 2018-06-01 11:34 ` Andy Shevchenko 2018-06-04 1:06 ` Yisheng Xie 2018-06-04 1:06 ` Yisheng Xie 2018-06-04 10:06 ` Andy Shevchenko 2018-06-04 10:06 ` Andy Shevchenko 2018-06-05 9:05 ` Yisheng Xie 2018-06-05 9:05 ` Yisheng Xie 2018-06-06 2:19 ` [PATCH v3 " Yisheng Xie 2018-06-06 2:19 ` Yisheng Xie 2018-06-06 5:01 ` Andy Shevchenko 2018-06-06 5:01 ` Andy Shevchenko 2018-06-21 1:13 ` Yisheng Xie 2018-06-21 1:13 ` Yisheng Xie 2018-06-21 1:39 ` Yisheng Xie [this message] 2018-06-21 1:39 ` [PATCH v4 " Yisheng Xie 2018-06-21 2:24 ` Andy Shevchenko 2018-06-21 2:24 ` Andy Shevchenko 2018-05-31 12:23 ` [PATCH v2 00/21] " Yisheng Xie
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=29324e04-e6c3-188c-a7fa-0363305b6455@huawei.com \ --to=xieyisheng1@huawei.com \ --cc=andy.shevchenko@gmail.com \ --cc=anthony.yznaga@oracle.com \ --cc=davem@davemloft.net \ --cc=linux-kernel@vger.kernel.org \ --cc=pasha.tatashin@oracle.com \ --cc=sparclinux@vger.kernel.org \ --cc=wangkefeng.wang@huawei.com \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.