[PATCH -next] ASoC: cs42l52: fix the return value of cs42l52_set_fmt()

[PATCH -next] ASoC: cs42l52: fix the return value of cs42l52_set_fmt()

[Wei Yongjun]

From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>

Fix the return value of cs42l52_set_fmt() when clock inversion is
not allowed and also remove the useless variable ret.

dpatch engine is used to auto generate this patch.
(https://github.com/weiyj/dpatch)

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
---
 sound/soc/codecs/cs42l52.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/sound/soc/codecs/cs42l52.c b/sound/soc/codecs/cs42l52.c
index 4d8db36..97a8105 100644
--- a/sound/soc/codecs/cs42l52.c
+++ b/sound/soc/codecs/cs42l52.c
@@ -773,7 +773,6 @@ static int cs42l52_set_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)
 {
 	struct snd_soc_codec *codec = codec_dai->codec;
 	struct cs42l52_private *cs42l52 = snd_soc_codec_get_drvdata(codec);
-	int ret = 0;
 	u8 iface = 0;
 
 	switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
@@ -822,7 +821,7 @@ static int cs42l52_set_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)
 	case SND_SOC_DAIFMT_NB_IF:
 		break;
 	default:
-		ret = -EINVAL;
+		return -EINVAL;
 	}
 	cs42l52->config.format = iface;
 	snd_soc_write(codec, CS42L52_IFACE_CTL1, cs42l52->config.format);

Re: [PATCH -next] ASoC: cs42l52: fix the return value of cs42l52_set_fmt()

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 888 bytes --]

On Wed, Nov 07, 2012 at 08:38:35PM +0800, Wei Yongjun wrote:
> From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
> 
> Fix the return value of cs42l52_set_fmt() when clock inversion is
> not allowed and also remove the useless variable ret.

Applied, but you need to work on your changelogs:

What is wrong with the return value?

>  	u8 iface = 0;
>  
>  	switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
> @@ -822,7 +821,7 @@ static int cs42l52_set_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)
>  	case SND_SOC_DAIFMT_NB_IF:
>  		break;
>  	default:
> -		ret = -EINVAL;
> +		return -EINVAL;
>  	}
>  	cs42l52->config.format = iface;
>  	snd_soc_write(codec, CS42L52_IFACE_CTL1, cs42l52->config.format);
> 

This doesn't look like it changes the return value...  the actual issue
here is that we don't pay attention to ret later on, we just always
return 0.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]