From: Yisheng Xie <xieyisheng1@huawei.com> To: <linux-kernel@vger.kernel.org> Cc: Yisheng Xie <xieyisheng1@huawei.com>, Liam Girdwood <lgirdwood@gmail.com>, Mark Brown <broonie@kernel.org>, Jaroslav Kysela <perex@perex.cz>, "Takashi Iwai" <tiwai@suse.com>, <alsa-devel@alsa-project.org> Subject: [PATCH 33/33] ASoC: dapm: use match_string() helper Date: Mon, 21 May 2018 19:58:10 +0800 [thread overview] Message-ID: <1526903890-35761-34-git-send-email-xieyisheng1@huawei.com> (raw) In-Reply-To: <1526903890-35761-1-git-send-email-xieyisheng1@huawei.com> match_string() returns the index of an array for a matching string, which can be used intead of open coded variant. Cc: Liam Girdwood <lgirdwood@gmail.com> Cc: Mark Brown <broonie@kernel.org> Cc: Jaroslav Kysela <perex@perex.cz> Cc: Takashi Iwai <tiwai@suse.com> Cc: alsa-devel@alsa-project.org Signed-off-by: Yisheng Xie <xieyisheng1@huawei.com> --- sound/soc/soc-dapm.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 2d97091..1e9a363 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -724,18 +724,14 @@ static int dapm_connect_mux(struct snd_soc_dapm_context *dapm, item = 0; } - for (i = 0; i < e->items; i++) { - if (!(strcmp(control_name, e->texts[i]))) { - path->name = e->texts[i]; - if (i == item) - path->connect = 1; - else - path->connect = 0; - return 0; - } - } + i = match_string(e->texts, e->items, control_name); + if (i < 0) + return -ENODEV; + + path->name = e->texts[i]; + path->connect = (i == item); + return 0; - return -ENODEV; } /* set up initial codec paths */ -- 1.7.12.4
WARNING: multiple messages have this Message-ID (diff)
From: Yisheng Xie <xieyisheng1@huawei.com> To: linux-kernel@vger.kernel.org Cc: Yisheng Xie <xieyisheng1@huawei.com>, Liam Girdwood <lgirdwood@gmail.com>, Mark Brown <broonie@kernel.org>, Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com>, alsa-devel@alsa-project.org Subject: [PATCH 33/33] ASoC: dapm: use match_string() helper Date: Mon, 21 May 2018 19:58:10 +0800 [thread overview] Message-ID: <1526903890-35761-34-git-send-email-xieyisheng1@huawei.com> (raw) In-Reply-To: <1526903890-35761-1-git-send-email-xieyisheng1@huawei.com> match_string() returns the index of an array for a matching string, which can be used intead of open coded variant. Cc: Liam Girdwood <lgirdwood@gmail.com> Cc: Mark Brown <broonie@kernel.org> Cc: Jaroslav Kysela <perex@perex.cz> Cc: Takashi Iwai <tiwai@suse.com> Cc: alsa-devel@alsa-project.org Signed-off-by: Yisheng Xie <xieyisheng1@huawei.com> --- sound/soc/soc-dapm.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 2d97091..1e9a363 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -724,18 +724,14 @@ static int dapm_connect_mux(struct snd_soc_dapm_context *dapm, item = 0; } - for (i = 0; i < e->items; i++) { - if (!(strcmp(control_name, e->texts[i]))) { - path->name = e->texts[i]; - if (i == item) - path->connect = 1; - else - path->connect = 0; - return 0; - } - } + i = match_string(e->texts, e->items, control_name); + if (i < 0) + return -ENODEV; + + path->name = e->texts[i]; + path->connect = (i == item); + return 0; - return -ENODEV; } /* set up initial codec paths */ -- 1.7.12.4
next prev parent reply other threads:[~2018-05-21 12:09 UTC|newest] Thread overview: 137+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-05-21 11:57 [PATCH 00/33] use match_string() helper Yisheng Xie 2018-05-21 11:57 ` [PATCH 01/33] usb: phy: " Yisheng Xie 2018-05-21 11:57 ` [01/33] " Xie Yisheng 2018-05-21 22:20 ` [PATCH 01/33] " Andy Shevchenko 2018-05-21 22:20 ` [01/33] " Andy Shevchenko 2018-05-22 10:02 ` [PATCH 01/33] " Greg Kroah-Hartman 2018-05-22 10:02 ` [01/33] " Greg Kroah-Hartman 2018-05-22 11:12 ` [PATCH 01/33] " Yisheng Xie 2018-05-22 11:12 ` [01/33] " Xie Yisheng 2018-05-21 11:57 ` [PATCH 02/33] mfd: omap-usb-host: " Yisheng Xie 2018-05-21 11:57 ` Yisheng Xie 2018-05-21 17:41 ` Tony Lindgren 2018-06-04 6:15 ` Lee Jones 2018-05-21 11:57 ` [PATCH 03/33] Staging: gdm724x: " Yisheng Xie 2018-05-21 21:35 ` Andy Shevchenko 2018-05-21 11:57 ` [PATCH 04/33] gpiolib-of: " Yisheng Xie 2018-05-21 11:57 ` Yisheng Xie 2018-05-21 21:36 ` Andy Shevchenko 2018-05-21 11:57 ` [PATCH 05/33] cxgb4: " Yisheng Xie 2018-05-21 21:39 ` Andy Shevchenko 2018-05-22 0:55 ` Yisheng Xie 2018-05-21 11:57 ` [PATCH 06/33] hp100: " Yisheng Xie 2018-05-21 11:57 ` [PATCH 07/33] iwlwifi: mvm: " Yisheng Xie 2018-05-21 20:12 ` Luca Coelho 2018-05-21 21:43 ` Andy Shevchenko 2018-05-22 3:30 ` Yisheng Xie 2018-05-22 20:41 ` Andy Shevchenko 2018-05-21 11:57 ` [PATCH 08/33] vfio: " Yisheng Xie 2018-05-25 20:55 ` Alex Williamson 2018-05-21 11:57 ` [PATCH 09/33] phy: tegra: " Yisheng Xie 2018-05-21 21:45 ` Andy Shevchenko 2018-05-21 11:57 ` [PATCH 10/33] pata_hpt37x: " Yisheng Xie 2018-05-21 11:57 ` Yisheng Xie 2018-05-21 21:46 ` Andy Shevchenko 2018-05-21 11:57 ` [PATCH 11/33] bus: fsl-mc: " Yisheng Xie 2018-05-21 11:57 ` [PATCH 12/33] clk: bcm2835: " Yisheng Xie 2018-05-21 11:57 ` Yisheng Xie 2018-05-21 17:48 ` Eric Anholt 2018-05-21 17:48 ` Eric Anholt 2018-05-21 21:50 ` Andy Shevchenko 2018-05-21 21:50 ` Andy Shevchenko 2018-05-22 3:42 ` Yisheng Xie 2018-05-22 3:42 ` Yisheng Xie 2018-05-21 11:57 ` [PATCH 13/33] clk: rockchip: " Yisheng Xie 2018-05-21 11:57 ` Yisheng Xie 2018-05-21 11:57 ` Yisheng Xie 2018-05-22 13:56 ` Heiko Stuebner 2018-05-22 13:56 ` Heiko Stuebner 2018-05-21 11:57 ` [PATCH 14/33] clk: " Yisheng Xie 2018-05-21 21:53 ` Andy Shevchenko 2018-05-21 11:57 ` [PATCH 15/33] cpufreq: intel_pstate: " Yisheng Xie 2018-05-21 11:57 ` Yisheng Xie 2018-05-21 11:57 ` [PATCH 16/33] mmc: sdhci-xenon: " Yisheng Xie 2018-05-21 11:57 ` Yisheng Xie 2018-05-24 7:58 ` Adrian Hunter 2018-05-28 11:27 ` Ulf Hansson 2018-05-21 11:57 ` [PATCH 17/33] pinctrl: armada-37xx: " Yisheng Xie 2018-05-21 11:57 ` Yisheng Xie 2018-05-21 11:57 ` Yisheng Xie 2018-05-21 21:55 ` Andy Shevchenko 2018-05-21 21:55 ` Andy Shevchenko 2018-05-21 11:57 ` [PATCH 18/33] power: supply: " Yisheng Xie 2018-05-21 11:57 ` Yisheng Xie 2018-05-21 21:58 ` Andy Shevchenko 2018-05-22 16:16 ` Sebastian Reichel 2018-05-21 11:57 ` [PATCH 19/33] thermal: db8500: " Yisheng Xie 2018-05-21 11:57 ` Yisheng Xie 2018-05-21 22:00 ` Andy Shevchenko 2018-05-23 7:47 ` Yisheng Xie 2018-06-05 16:14 ` Andy Shevchenko 2018-05-21 11:57 ` [PATCH 20/33] video: fbdev: pxafb: " Yisheng Xie 2018-05-21 11:57 ` Yisheng Xie 2018-05-21 22:01 ` Andy Shevchenko 2018-05-21 22:01 ` Andy Shevchenko 2018-05-21 11:57 ` [PATCH 21/33] drm/nouveau: " Yisheng Xie 2018-05-21 11:57 ` Yisheng Xie 2018-05-21 22:03 ` Andy Shevchenko 2018-05-21 22:03 ` Andy Shevchenko 2018-05-21 11:57 ` [PATCH 22/33] drm/i915: " Yisheng Xie 2018-05-21 11:57 ` Yisheng Xie 2018-05-21 22:04 ` Andy Shevchenko 2018-05-21 22:04 ` Andy Shevchenko 2018-05-22 8:36 ` Jani Nikula 2018-05-22 8:36 ` Jani Nikula 2018-05-22 9:22 ` Yisheng Xie 2018-05-22 9:22 ` Yisheng Xie 2018-05-21 11:58 ` [PATCH 23/33] drm: i2c: ch7006: " Yisheng Xie 2018-05-21 11:58 ` Yisheng Xie 2018-05-21 11:58 ` [PATCH 24/33] drm: " Yisheng Xie 2018-05-21 11:58 ` Yisheng Xie 2018-05-21 22:06 ` Andy Shevchenko 2018-05-21 22:06 ` Andy Shevchenko 2018-05-22 8:39 ` Jani Nikula 2018-05-22 8:39 ` Jani Nikula 2018-05-21 11:58 ` [PATCH 25/33] ima: " Yisheng Xie 2018-05-21 11:58 ` Yisheng Xie 2018-05-23 14:42 ` Mimi Zohar 2018-05-23 14:42 ` Mimi Zohar 2018-05-21 11:58 ` [PATCH 26/33] apparmor: " Yisheng Xie 2018-05-21 11:58 ` Yisheng Xie 2018-05-21 15:33 ` John Johansen 2018-05-21 15:33 ` John Johansen 2018-05-22 1:25 ` Yisheng Xie 2018-05-22 1:25 ` Yisheng Xie 2018-05-21 22:10 ` Andy Shevchenko 2018-05-21 22:10 ` Andy Shevchenko 2018-05-21 11:58 ` [PATCH 27/33] sched/debug: " Yisheng Xie 2018-05-21 22:13 ` Andy Shevchenko 2018-05-22 12:10 ` Yisheng Xie 2018-05-22 20:29 ` Andy Shevchenko 2018-05-21 11:58 ` [PATCH 28/33] ALSA: dice " Yisheng Xie 2018-05-21 11:58 ` Yisheng Xie 2018-05-21 22:31 ` Takashi Sakamoto 2018-05-21 11:58 ` [PATCH 29/33] ALSA: oxfw: " Yisheng Xie 2018-05-21 11:58 ` Yisheng Xie 2018-05-21 22:26 ` [alsa-devel] " Takashi Sakamoto 2018-05-22 7:26 ` Takashi Iwai 2018-05-22 7:26 ` Takashi Iwai 2018-05-21 11:58 ` [PATCH 30/33] ALSA: oxygen: " Yisheng Xie 2018-05-21 11:58 ` Yisheng Xie 2018-05-21 22:23 ` Andy Shevchenko 2018-05-21 11:58 ` [PATCH 31/33] ASoC: max98088: " Yisheng Xie 2018-05-21 11:58 ` Yisheng Xie 2018-05-21 22:24 ` Andy Shevchenko 2018-05-21 22:24 ` Andy Shevchenko 2018-05-22 12:30 ` Yisheng Xie 2018-05-22 17:23 ` Andy Shevchenko 2018-05-21 11:58 ` [PATCH 32/33] ASoC: max98095: " Yisheng Xie 2018-05-21 11:58 ` Yisheng Xie 2018-05-21 22:25 ` Andy Shevchenko 2018-05-21 22:25 ` Andy Shevchenko 2018-05-21 11:58 ` Yisheng Xie [this message] 2018-05-21 11:58 ` [PATCH 33/33] ASoC: dapm: " Yisheng Xie 2018-05-31 16:09 ` Applied "ASoC: dapm: use match_string() helper" to the asoc tree Mark Brown 2018-05-31 16:09 ` Mark Brown 2018-05-21 22:27 ` [PATCH 00/33] use match_string() helper Andy Shevchenko 2018-05-22 0:52 ` 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=1526903890-35761-34-git-send-email-xieyisheng1@huawei.com \ --to=xieyisheng1@huawei.com \ --cc=alsa-devel@alsa-project.org \ --cc=broonie@kernel.org \ --cc=lgirdwood@gmail.com \ --cc=linux-kernel@vger.kernel.org \ --cc=perex@perex.cz \ --cc=tiwai@suse.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.