From b144f256427e0d35910bba38871ed4ec66a19182 Mon Sep 17 00:00:00 2001 From: Xiubo Li Date: Wed, 8 Jan 2014 16:13:05 +0800 Subject: ASoC: fsl-sai: Clean up the code Makes the code slightly shorter. Signed-off-by: Xiubo Li Signed-off-by: Mark Brown --- This patch is pulled back from upstream: commit 633ff8f8a4393b4a13b94eddd2613198c32035e6 Change-Id: Ic59247589f69e0705d49fc4db9e7d269125856d8 Reviewed-on: http://git.am.freescale.net:8181/19750 Tested-by: Review Code-CDREVIEW Reviewed-by: Zhengxiong Jin diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c index 5802fbd..34ee871 100644 --- a/sound/soc/fsl/fsl_sai.c +++ b/sound/soc/fsl/fsl_sai.c @@ -62,26 +62,25 @@ static int fsl_sai_set_dai_sysclk_tr(struct snd_soc_dai *cpu_dai, reg_cr2 = FSL_SAI_RCR2; val_cr2 = sai_readl(sai, sai->base + reg_cr2); + val_cr2 &= ~FSL_SAI_CR2_MSEL_MASK; + switch (clk_id) { case FSL_SAI_CLK_BUS: - val_cr2 &= ~FSL_SAI_CR2_MSEL_MASK; val_cr2 |= FSL_SAI_CR2_MSEL_BUS; break; case FSL_SAI_CLK_MAST1: - val_cr2 &= ~FSL_SAI_CR2_MSEL_MASK; val_cr2 |= FSL_SAI_CR2_MSEL_MCLK1; break; case FSL_SAI_CLK_MAST2: - val_cr2 &= ~FSL_SAI_CR2_MSEL_MASK; val_cr2 |= FSL_SAI_CR2_MSEL_MCLK2; break; case FSL_SAI_CLK_MAST3: - val_cr2 &= ~FSL_SAI_CR2_MSEL_MASK; val_cr2 |= FSL_SAI_CR2_MSEL_MCLK3; break; default: return -EINVAL; } + sai_writel(sai, val_cr2, sai->base + reg_cr2); return 0; -- cgit v0.10.2