* [PATCH] ASoC: Intel: mrfld: simplify sst_fill_widget_module_info
@ 2015-06-04 8:13 Rasmus Villemoes
2015-06-15 5:08 ` Vinod Koul
2015-06-15 9:51 ` Mark Brown
0 siblings, 2 replies; 3+ messages in thread
From: Rasmus Villemoes @ 2015-06-04 8:13 UTC (permalink / raw)
To: Vinod Koul, Liam Girdwood, Mark Brown, Jaroslav Kysela,
Takashi Iwai
Cc: Rasmus Villemoes, alsa-devel, linux-kernel
Some tiny improvements, cutting 180 bytes off the generated code.
- use strchr() for single-character needle
- compute index using pointer subtraction instead of two strlen()
calls
- factor out the common check for whether the initial part of
kctl->id.name (before the space) is identical to w->name.
Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
---
sound/soc/intel/atom/sst-atom-controls.c | 20 ++++++++------------
1 file changed, 8 insertions(+), 12 deletions(-)
diff --git a/sound/soc/intel/atom/sst-atom-controls.c b/sound/soc/intel/atom/sst-atom-controls.c
index 90aa5c0476f3..16670feeee6a 100644
--- a/sound/soc/intel/atom/sst-atom-controls.c
+++ b/sound/soc/intel/atom/sst-atom-controls.c
@@ -1280,36 +1280,32 @@ static int sst_fill_widget_module_info(struct snd_soc_dapm_widget *w,
down_read(&card->controls_rwsem);
list_for_each_entry(kctl, &card->controls, list) {
- idx = strstr(kctl->id.name, " ");
+ idx = strchr(kctl->id.name, ' ');
if (idx == NULL)
continue;
- index = strlen(kctl->id.name) - strlen(idx);
+ index = idx - (char*)kctl->id.name;
+ if (strncmp(kctl->id.name, w->name, index))
+ continue;
- if (strstr(kctl->id.name, "Volume") &&
- !strncmp(kctl->id.name, w->name, index))
+ if (strstr(kctl->id.name, "Volume"))
ret = sst_fill_module_list(kctl, w, SST_MODULE_GAIN);
- else if (strstr(kctl->id.name, "params") &&
- !strncmp(kctl->id.name, w->name, index))
+ else if (strstr(kctl->id.name, "params"))
ret = sst_fill_module_list(kctl, w, SST_MODULE_ALGO);
else if (strstr(kctl->id.name, "Switch") &&
- !strncmp(kctl->id.name, w->name, index) &&
strstr(kctl->id.name, "Gain")) {
struct sst_gain_mixer_control *mc =
(void *)kctl->private_value;
mc->w = w;
- } else if (strstr(kctl->id.name, "interleaver") &&
- !strncmp(kctl->id.name, w->name, index)) {
+ } else if (strstr(kctl->id.name, "interleaver")) {
struct sst_enum *e = (void *)kctl->private_value;
e->w = w;
- } else if (strstr(kctl->id.name, "deinterleaver") &&
- !strncmp(kctl->id.name, w->name, index)) {
-
+ } else if (strstr(kctl->id.name, "deinterleaver")) {
struct sst_enum *e = (void *)kctl->private_value;
e->w = w;
--
2.1.3
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] ASoC: Intel: mrfld: simplify sst_fill_widget_module_info
2015-06-04 8:13 [PATCH] ASoC: Intel: mrfld: simplify sst_fill_widget_module_info Rasmus Villemoes
@ 2015-06-15 5:08 ` Vinod Koul
2015-06-15 9:51 ` Mark Brown
1 sibling, 0 replies; 3+ messages in thread
From: Vinod Koul @ 2015-06-15 5:08 UTC (permalink / raw)
To: Rasmus Villemoes
Cc: Liam Girdwood, Mark Brown, Jaroslav Kysela, Takashi Iwai,
alsa-devel, linux-kernel, yang.a.fang
On Thu, Jun 04, 2015 at 10:13:53AM +0200, Rasmus Villemoes wrote:
> Some tiny improvements, cutting 180 bytes off the generated code.
>
> - use strchr() for single-character needle
>
> - compute index using pointer subtraction instead of two strlen()
> calls
>
> - factor out the common check for whether the initial part of
> kctl->id.name (before the space) is identical to w->name.
Acked-by: Vinod Koul <vinod.koul@intel.com
Also Terry did the tests on this patch so would be good to add
Tested-by: Fang, Yang A <yang.a.fang@intel.com>
--
~Vinod
>
> Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
> ---
> sound/soc/intel/atom/sst-atom-controls.c | 20 ++++++++------------
> 1 file changed, 8 insertions(+), 12 deletions(-)
>
> diff --git a/sound/soc/intel/atom/sst-atom-controls.c b/sound/soc/intel/atom/sst-atom-controls.c
> index 90aa5c0476f3..16670feeee6a 100644
> --- a/sound/soc/intel/atom/sst-atom-controls.c
> +++ b/sound/soc/intel/atom/sst-atom-controls.c
> @@ -1280,36 +1280,32 @@ static int sst_fill_widget_module_info(struct snd_soc_dapm_widget *w,
> down_read(&card->controls_rwsem);
>
> list_for_each_entry(kctl, &card->controls, list) {
> - idx = strstr(kctl->id.name, " ");
> + idx = strchr(kctl->id.name, ' ');
> if (idx == NULL)
> continue;
> - index = strlen(kctl->id.name) - strlen(idx);
> + index = idx - (char*)kctl->id.name;
> + if (strncmp(kctl->id.name, w->name, index))
> + continue;
>
> - if (strstr(kctl->id.name, "Volume") &&
> - !strncmp(kctl->id.name, w->name, index))
> + if (strstr(kctl->id.name, "Volume"))
> ret = sst_fill_module_list(kctl, w, SST_MODULE_GAIN);
>
> - else if (strstr(kctl->id.name, "params") &&
> - !strncmp(kctl->id.name, w->name, index))
> + else if (strstr(kctl->id.name, "params"))
> ret = sst_fill_module_list(kctl, w, SST_MODULE_ALGO);
>
> else if (strstr(kctl->id.name, "Switch") &&
> - !strncmp(kctl->id.name, w->name, index) &&
> strstr(kctl->id.name, "Gain")) {
> struct sst_gain_mixer_control *mc =
> (void *)kctl->private_value;
>
> mc->w = w;
>
> - } else if (strstr(kctl->id.name, "interleaver") &&
> - !strncmp(kctl->id.name, w->name, index)) {
> + } else if (strstr(kctl->id.name, "interleaver")) {
> struct sst_enum *e = (void *)kctl->private_value;
>
> e->w = w;
>
> - } else if (strstr(kctl->id.name, "deinterleaver") &&
> - !strncmp(kctl->id.name, w->name, index)) {
> -
> + } else if (strstr(kctl->id.name, "deinterleaver")) {
> struct sst_enum *e = (void *)kctl->private_value;
>
> e->w = w;
> --
> 2.1.3
>
--
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] ASoC: Intel: mrfld: simplify sst_fill_widget_module_info
2015-06-04 8:13 [PATCH] ASoC: Intel: mrfld: simplify sst_fill_widget_module_info Rasmus Villemoes
2015-06-15 5:08 ` Vinod Koul
@ 2015-06-15 9:51 ` Mark Brown
1 sibling, 0 replies; 3+ messages in thread
From: Mark Brown @ 2015-06-15 9:51 UTC (permalink / raw)
To: Rasmus Villemoes
Cc: Vinod Koul, Liam Girdwood, Jaroslav Kysela, Takashi Iwai,
alsa-devel, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 151 bytes --]
On Thu, Jun 04, 2015 at 10:13:53AM +0200, Rasmus Villemoes wrote:
> Some tiny improvements, cutting 180 bytes off the generated code.
Applied, thanks
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 473 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-06-15 9:51 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-06-04 8:13 [PATCH] ASoC: Intel: mrfld: simplify sst_fill_widget_module_info Rasmus Villemoes
2015-06-15 5:08 ` Vinod Koul
2015-06-15 9:51 ` Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox