| Message ID | 20210510083640.3368-1-thunder.leizhen@huawei.com |
|---|---|
| State | Accepted |
| Commit | 85c966dc97d1c46a3079ec4c26714c9f8ec66823 |
| Headers | show |
| Series | [1/1] ASoC: mediatek: mt8192: Delete a redundant condition branch | expand |
On Mon, 10 May 2021 16:36:40 +0800, Zhen Lei wrote: > The statement of the "if (afe_priv->mtkaif_protocol == MTKAIF_PROTOCOL_2)" > branch is the same as the "else" branch. Delete it to simplify code. > > No functional change. Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: mediatek: mt8192: Delete a redundant condition branch commit: 85c966dc97d1c46a3079ec4c26714c9f8ec66823 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
diff --git a/sound/soc/mediatek/mt8192/mt8192-dai-adda.c b/sound/soc/mediatek/mt8192/mt8192-dai-adda.c index f040dce85da537b..f8c73e8624df20b 100644 --- a/sound/soc/mediatek/mt8192/mt8192-dai-adda.c +++ b/sound/soc/mediatek/mt8192/mt8192-dai-adda.c @@ -413,8 +413,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, 0x38); - else if (afe_priv->mtkaif_protocol == MTKAIF_PROTOCOL_2) - regmap_write(afe->regmap, AFE_AUD_PAD_TOP, 0x30); else regmap_write(afe->regmap, AFE_AUD_PAD_TOP, 0x30); break;
The statement of the "if (afe_priv->mtkaif_protocol == MTKAIF_PROTOCOL_2)" branch is the same as the "else" branch. Delete it to simplify code. No functional change. Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com> --- sound/soc/mediatek/mt8192/mt8192-dai-adda.c | 2 -- 1 file changed, 2 deletions(-)