From: Nicolin Chen Date: Fri, 20 Dec 2013 08:41:02 +0000 (+0800) Subject: ASoC: fsl_sai: Drop useless channels check in hw_params() X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d22e28cce80a93578787d273bf1fa26a2be2636b;p=linux-beck.git 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 Reviewed-by: Xiubo Li Signed-off-by: Mark Brown --- 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, val_cr5 |= FSL_SAI_CR5_FBT(0); val_cr4 |= FSL_SAI_CR4_FRSZ(channels); - if (channels == 2 || channels == 1) - val_mr = ~0UL - ((1 << channels) - 1); - else - return -EINVAL; + val_mr = ~0UL - ((1 << channels) - 1); sai_writel(sai, val_cr4, sai->base + reg_cr4); sai_writel(sai, val_cr5, sai->base + reg_cr5);