| Message ID | 20231023095428.166563-6-krzysztof.kozlowski@linaro.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | a1fa72a780f428ddc956cf5ed4b97e2be76ceba3 |
| Headers | show |
| Series | ASoC: fix widget name comparisons (consider DAI name prefix) | expand |
On Mon, 2023-10-23 at 11:54 +0200, Krzysztof Kozlowski wrote: > Use snd_soc_dapm_widget_name_cmp() helper when comparing widget names, > to include also the component's name prefix. > > Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > --- Reviewed-by: Nuno Sa <nuno.sa@analog.com> > sound/soc/codecs/max9867.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/sound/soc/codecs/max9867.c b/sound/soc/codecs/max9867.c > index b616ad39858c..3b9dd158c34b 100644 > --- a/sound/soc/codecs/max9867.c > +++ b/sound/soc/codecs/max9867.c > @@ -56,13 +56,13 @@ static int max9867_adc_dac_event(struct snd_soc_dapm_widget *w, > struct max9867_priv *max9867 = snd_soc_component_get_drvdata(component); > enum max9867_adc_dac adc_dac; > > - if (!strcmp(w->name, "ADCL")) > + if (!snd_soc_dapm_widget_name_cmp(w, "ADCL")) > adc_dac = MAX9867_ADC_LEFT; > - else if (!strcmp(w->name, "ADCR")) > + else if (!snd_soc_dapm_widget_name_cmp(w, "ADCR")) > adc_dac = MAX9867_ADC_RIGHT; > - else if (!strcmp(w->name, "DACL")) > + else if (!snd_soc_dapm_widget_name_cmp(w, "DACL")) > adc_dac = MAX9867_DAC_LEFT; > - else if (!strcmp(w->name, "DACR")) > + else if (!snd_soc_dapm_widget_name_cmp(w, "DACR")) > adc_dac = MAX9867_DAC_RIGHT; > else > return 0;
diff --git a/sound/soc/codecs/max9867.c b/sound/soc/codecs/max9867.c index b616ad39858c..3b9dd158c34b 100644 --- a/sound/soc/codecs/max9867.c +++ b/sound/soc/codecs/max9867.c @@ -56,13 +56,13 @@ static int max9867_adc_dac_event(struct snd_soc_dapm_widget *w, struct max9867_priv *max9867 = snd_soc_component_get_drvdata(component); enum max9867_adc_dac adc_dac; - if (!strcmp(w->name, "ADCL")) + if (!snd_soc_dapm_widget_name_cmp(w, "ADCL")) adc_dac = MAX9867_ADC_LEFT; - else if (!strcmp(w->name, "ADCR")) + else if (!snd_soc_dapm_widget_name_cmp(w, "ADCR")) adc_dac = MAX9867_ADC_RIGHT; - else if (!strcmp(w->name, "DACL")) + else if (!snd_soc_dapm_widget_name_cmp(w, "DACL")) adc_dac = MAX9867_DAC_LEFT; - else if (!strcmp(w->name, "DACR")) + else if (!snd_soc_dapm_widget_name_cmp(w, "DACR")) adc_dac = MAX9867_DAC_RIGHT; else return 0;
Use snd_soc_dapm_widget_name_cmp() helper when comparing widget names, to include also the component's name prefix. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> --- sound/soc/codecs/max9867.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)