aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolin Chen <Guangyu.Chen@freescale.com>2013-12-20 03:41:02 -0500
committerMark Brown <broonie@linaro.org>2013-12-21 09:47:29 -0500
commitd22e28cce80a93578787d273bf1fa26a2be2636b (patch)
tree91237ca6db7c85e5a2cb59c3aae71058449b49e9
parent1d7003092771bd2feec30e2f3e5a06aa33479e08 (diff)
ASoC: fsl_sai: Drop useless channels check in hw_params()
SAi only supports two data channels on hardware level and the driver also does register the min->1 and max->2, so no need to check channels. Signed-off-by: Nicolin Chen <Guangyu.Chen@freescale.com> Reviewed-by: Xiubo Li <Li.Xiubo@freescale.com> Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r--sound/soc/fsl/fsl_sai.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c
index e68102e63521..8450bff6fb13 100644
--- a/sound/soc/fsl/fsl_sai.c
+++ b/sound/soc/fsl/fsl_sai.c
@@ -278,10 +278,7 @@ static int fsl_sai_hw_params(struct snd_pcm_substream *substream,
278 val_cr5 |= FSL_SAI_CR5_FBT(0); 278 val_cr5 |= FSL_SAI_CR5_FBT(0);
279 279
280 val_cr4 |= FSL_SAI_CR4_FRSZ(channels); 280 val_cr4 |= FSL_SAI_CR4_FRSZ(channels);
281 if (channels == 2 || channels == 1) 281 val_mr = ~0UL - ((1 << channels) - 1);
282 val_mr = ~0UL - ((1 << channels) - 1);
283 else
284 return -EINVAL;
285 282
286 sai_writel(sai, val_cr4, sai->base + reg_cr4); 283 sai_writel(sai, val_cr4, sai->base + reg_cr4);
287 sai_writel(sai, val_cr5, sai->base + reg_cr5); 284 sai_writel(sai, val_cr5, sai->base + reg_cr5);