[PATCH] ASoC: mediatek: mt8186: Remove condition with no effect

[PATCH] ASoC: mediatek: mt8186: Remove condition with no effect

[Zhongjun Tan]

From: Zhongjun Tan <tanzhongjun@coolpad.com>

Remove condition with no effect

Signed-off-by: Zhongjun Tan <tanzhongjun@coolpad.com>
---
 sound/soc/mediatek/mt8186/mt8186-dai-adda.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/sound/soc/mediatek/mt8186/mt8186-dai-adda.c b/sound/soc/mediatek/mt8186/mt8186-dai-adda.c
index db71b032770d..6be6d4f3b585 100644
--- a/sound/soc/mediatek/mt8186/mt8186-dai-adda.c
+++ b/sound/soc/mediatek/mt8186/mt8186-dai-adda.c
@@ -295,8 +295,6 @@ static int mtk_adda_pad_top_event(struct snd_soc_dapm_widget *w,
 	case SND_SOC_DAPM_PRE_PMU:
 		if (afe_priv->mtkaif_protocol == MTKAIF_PROTOCOL_2_CLK_P2)
 			regmap_write(afe->regmap, AFE_AUD_PAD_TOP, 0x39);
-		else if (afe_priv->mtkaif_protocol == MTKAIF_PROTOCOL_2)
-			regmap_write(afe->regmap, AFE_AUD_PAD_TOP, 0x31);
 		else
 			regmap_write(afe->regmap, AFE_AUD_PAD_TOP, 0x31);
 		break;
-- 
2.29.0

Re: [PATCH] ASoC: mediatek: mt8186: Remove condition with no effect

[AngeloGioacchino Del Regno]

Il 08/07/22 04:46, Zhongjun Tan ha scritto:
> From: Zhongjun Tan <tanzhongjun@coolpad.com>
> 
> Remove condition with no effect
> 
> Signed-off-by: Zhongjun Tan <tanzhongjun@coolpad.com>
> ---
>   sound/soc/mediatek/mt8186/mt8186-dai-adda.c | 2 --
>   1 file changed, 2 deletions(-)
> 
> diff --git a/sound/soc/mediatek/mt8186/mt8186-dai-adda.c b/sound/soc/mediatek/mt8186/mt8186-dai-adda.c
> index db71b032770d..6be6d4f3b585 100644
> --- a/sound/soc/mediatek/mt8186/mt8186-dai-adda.c
> +++ b/sound/soc/mediatek/mt8186/mt8186-dai-adda.c
> @@ -295,8 +295,6 @@ static int mtk_adda_pad_top_event(struct snd_soc_dapm_widget *w,
>   	case SND_SOC_DAPM_PRE_PMU:
>   		if (afe_priv->mtkaif_protocol == MTKAIF_PROTOCOL_2_CLK_P2)
>   			regmap_write(afe->regmap, AFE_AUD_PAD_TOP, 0x39);
> -		else if (afe_priv->mtkaif_protocol == MTKAIF_PROTOCOL_2)
> -			regmap_write(afe->regmap, AFE_AUD_PAD_TOP, 0x31);

I think that this needs some clarification from MediaTek: was 0x31 a typo here?

Regards,
Angelo

>   		else
>   			regmap_write(afe->regmap, AFE_AUD_PAD_TOP, 0x31);
>   		break;

Re: [PATCH] ASoC: mediatek: mt8186: Remove condition with no effect

[Matthias Brugger]

On 08/07/2022 10:01, AngeloGioacchino Del Regno wrote:
> Il 08/07/22 04:46, Zhongjun Tan ha scritto:
>> From: Zhongjun Tan <tanzhongjun@coolpad.com>
>>
>> Remove condition with no effect
>>
>> Signed-off-by: Zhongjun Tan <tanzhongjun@coolpad.com>
>> ---
>>   sound/soc/mediatek/mt8186/mt8186-dai-adda.c | 2 --
>>   1 file changed, 2 deletions(-)
>>
>> diff --git a/sound/soc/mediatek/mt8186/mt8186-dai-adda.c 
>> b/sound/soc/mediatek/mt8186/mt8186-dai-adda.c
>> index db71b032770d..6be6d4f3b585 100644
>> --- a/sound/soc/mediatek/mt8186/mt8186-dai-adda.c
>> +++ b/sound/soc/mediatek/mt8186/mt8186-dai-adda.c
>> @@ -295,8 +295,6 @@ static int mtk_adda_pad_top_event(struct 
>> snd_soc_dapm_widget *w,
>>       case SND_SOC_DAPM_PRE_PMU:
>>           if (afe_priv->mtkaif_protocol == MTKAIF_PROTOCOL_2_CLK_P2)
>>               regmap_write(afe->regmap, AFE_AUD_PAD_TOP, 0x39);
>> -        else if (afe_priv->mtkaif_protocol == MTKAIF_PROTOCOL_2)
>> -            regmap_write(afe->regmap, AFE_AUD_PAD_TOP, 0x31);
> 
> I think that this needs some clarification from MediaTek: was 0x31 a typo here?
> 

Looks like the write is covered by the else case already, so we don't need the 
else if here. In any case commit message could be improved.

Regards,
Matthias

> Regards,
> Angelo
> 
>>           else
>>               regmap_write(afe->regmap, AFE_AUD_PAD_TOP, 0x31);
>>           break;
> 
> 

Re: [PATCH] ASoC: mediatek: mt8186: Remove condition with no effect

[Jiaxin Yu]

On Fri, 2022-07-08 at 10:01 +0200, AngeloGioacchino Del Regno wrote:
> Il 08/07/22 04:46, Zhongjun Tan ha scritto:
> > From: Zhongjun Tan <tanzhongjun@coolpad.com>
> > 
> > Remove condition with no effect
> > 
> > Signed-off-by: Zhongjun Tan <tanzhongjun@coolpad.com>
> > ---
> >   sound/soc/mediatek/mt8186/mt8186-dai-adda.c | 2 --
> >   1 file changed, 2 deletions(-)
> > 
> > diff --git a/sound/soc/mediatek/mt8186/mt8186-dai-adda.c
> > b/sound/soc/mediatek/mt8186/mt8186-dai-adda.c
> > index db71b032770d..6be6d4f3b585 100644
> > --- a/sound/soc/mediatek/mt8186/mt8186-dai-adda.c
> > +++ b/sound/soc/mediatek/mt8186/mt8186-dai-adda.c
> > @@ -295,8 +295,6 @@ static int mtk_adda_pad_top_event(struct
> > snd_soc_dapm_widget *w,
> >   	case SND_SOC_DAPM_PRE_PMU:
> >   		if (afe_priv->mtkaif_protocol ==
> > MTKAIF_PROTOCOL_2_CLK_P2)
> >   			regmap_write(afe->regmap, AFE_AUD_PAD_TOP,
> > 0x39);
> > -		else if (afe_priv->mtkaif_protocol ==
> > MTKAIF_PROTOCOL_2)
> > -			regmap_write(afe->regmap, AFE_AUD_PAD_TOP,
> > 0x31);
> 
> I think that this needs some clarification from MediaTek: was 0x31 a
> typo here?
> 
> Regards,
> Angelo
> 
Hi Angelo,

This patch can be accepted. The 0x31 is not typo, the logic of this
code is not concise enough.

Thanks,
Jiaxin.Yu

> >   		else
> >   			regmap_write(afe->regmap, AFE_AUD_PAD_TOP,
> > 0x31);
> >   		break;
> 
> 

Re: [PATCH] ASoC: mediatek: mt8186: Remove condition with no effect

[AngeloGioacchino Del Regno]

Il 08/07/22 12:19, Jiaxin Yu ha scritto:
> On Fri, 2022-07-08 at 10:01 +0200, AngeloGioacchino Del Regno wrote:
>> Il 08/07/22 04:46, Zhongjun Tan ha scritto:
>>> From: Zhongjun Tan <tanzhongjun@coolpad.com>
>>>
>>> Remove condition with no effect
>>>
>>> Signed-off-by: Zhongjun Tan <tanzhongjun@coolpad.com>
>>> ---
>>>    sound/soc/mediatek/mt8186/mt8186-dai-adda.c | 2 --
>>>    1 file changed, 2 deletions(-)
>>>
>>> diff --git a/sound/soc/mediatek/mt8186/mt8186-dai-adda.c
>>> b/sound/soc/mediatek/mt8186/mt8186-dai-adda.c
>>> index db71b032770d..6be6d4f3b585 100644
>>> --- a/sound/soc/mediatek/mt8186/mt8186-dai-adda.c
>>> +++ b/sound/soc/mediatek/mt8186/mt8186-dai-adda.c
>>> @@ -295,8 +295,6 @@ static int mtk_adda_pad_top_event(struct
>>> snd_soc_dapm_widget *w,
>>>    	case SND_SOC_DAPM_PRE_PMU:
>>>    		if (afe_priv->mtkaif_protocol ==
>>> MTKAIF_PROTOCOL_2_CLK_P2)
>>>    			regmap_write(afe->regmap, AFE_AUD_PAD_TOP,
>>> 0x39);
>>> -		else if (afe_priv->mtkaif_protocol ==
>>> MTKAIF_PROTOCOL_2)
>>> -			regmap_write(afe->regmap, AFE_AUD_PAD_TOP,
>>> 0x31);
>>
>> I think that this needs some clarification from MediaTek: was 0x31 a
>> typo here?
>>
>> Regards,
>> Angelo
>>
> Hi Angelo,
> 
> This patch can be accepted. The 0x31 is not typo, the logic of this
> code is not concise enough.
> 
> Thanks,
> Jiaxin.Yu

Thank you for the clarification. In this case:

Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>

Cheers!

> 
>>>    		else
>>>    			regmap_write(afe->regmap, AFE_AUD_PAD_TOP,
>>> 0x31);
>>>    		break;
>>
>>
> 

Re: [PATCH] ASoC: mediatek: mt8186: Remove condition with no effect

[Mark Brown]

On Fri, 8 Jul 2022 10:46:51 +0800, Zhongjun Tan wrote:
> From: Zhongjun Tan <tanzhongjun@coolpad.com>
> 
> Remove condition with no effect
> 
> 

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/1] ASoC: mediatek: mt8186: Remove condition with no effect
      commit: 19bb587f3ffcb9c166bac2debdc3b08fb362c0b7

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark