Re: [PATCH v2 01/10] ASoC: tegra: Fix kcontrol put callback in ADMAIF

Jaroslav Kysela
2021-11-03T17:25:48Z

On 03. 11. 21 15:16, Takashi Iwai wrote:
> On Wed, 03 Nov 2021 14:52:17 +0100,
> Sameer Pujar wrote:
>>
>> The kcontrol put callback is expected to return 1 when there is change
>> in HW or when the update is acknowledged by driver. This would ensure
>> that change notifications are sent to subscribed applications. Update
>> the ADMAIF driver accordingly
>>
>> Fixes: f74028e159bb ("ASoC: tegra: Add Tegra210 based ADMAIF driver")
>> Suggested-by: Jaroslav Kysela <perex@perex.cz>
>> Suggested-by: Mark Brown <broonie@kernel.org>
>> Signed-off-by: Sameer Pujar <spujar@nvidia.com>
>> ---
>> sound/soc/tegra/tegra210_admaif.c | 23 ++++++++++++++++++-----
>> 1 file changed, 18 insertions(+), 5 deletions(-)
>>
>> diff --git a/sound/soc/tegra/tegra210_admaif.c b/sound/soc/tegra/tegra210_admaif.c
>> index bcccdf3..dc71075 100644
>> --- a/sound/soc/tegra/tegra210_admaif.c
>> +++ b/sound/soc/tegra/tegra210_admaif.c
>> @@ -452,16 +452,29 @@ static int tegra_admaif_put_control(struct snd_kcontrol *kcontrol,
>> struct tegra_admaif *admaif = snd_soc_component_get_drvdata(cmpnt);
>> int value = ucontrol->value.integer.value[0];
>>
>> - if (strstr(kcontrol->id.name, "Playback Mono To Stereo"))
>> + if (strstr(kcontrol->id.name, "Playback Mono To Stereo")) {
>> + if (admaif->mono_to_stereo[ADMAIF_TX_PATH][ec->reg] == value)
>> + return 0;
>> +
>> admaif->mono_to_stereo[ADMAIF_TX_PATH][ec->reg] = value;
>> - else if (strstr(kcontrol->id.name, "Capture Mono To Stereo"))
>> + } else if (strstr(kcontrol->id.name, "Capture Mono To Stereo")) {
>> + if (admaif->mono_to_stereo[ADMAIF_RX_PATH][ec->reg] == value)
>> + return 0;
>> +
>> admaif->mono_to_stereo[ADMAIF_RX_PATH][ec->reg] = value;
>> - else if (strstr(kcontrol->id.name, "Playback Stereo To Mono"))
>> + } else if (strstr(kcontrol->id.name, "Playback Stereo To Mono")) {
>> + if (admaif->stereo_to_mono[ADMAIF_TX_PATH][ec->reg] == value)
>> + return 0;
>> +
>> admaif->stereo_to_mono[ADMAIF_TX_PATH][ec->reg] = value;
>> - else if (strstr(kcontrol->id.name, "Capture Stereo To Mono"))
>> + } else if (strstr(kcontrol->id.name, "Capture Stereo To Mono")) {
>> + if (admaif->stereo_to_mono[ADMAIF_RX_PATH][ec->reg] == value)
>> + return 0;
>> +
>> admaif->stereo_to_mono[ADMAIF_RX_PATH][ec->reg] = value;
>> + }
>>
>> - return 0;
>> + return 1;
>
> Hrm, that looks too redundant. The similar checks are seen in the get
> part, so we may have a better helper function to reduce the string
> checks, something like below.

While proposing such cleanups, I would create separate get/put callbacks for
all four ops instead using strstr(). The callbacks may put the common code to
one function. It may reduce the code size (and the text segment size).

Jaroslav

--
Jaroslav Kysela <perex@perex.cz>
Linux Sound Maintainer; ALSA Project; Red Hat, Inc.