ASoC: lm49453: fix build warnings
authorM R Swami Reddy <mr.swami.reddy@ti.com>
Thu, 5 Apr 2012 15:24:09 +0000 (20:54 +0530)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 5 Apr 2012 21:01:19 +0000 (22:01 +0100)
sound/soc/codecs/lm49453.c: In function 'lm49453_set_dai_fmt':
sound/soc/codecs/lm49453.c:1189:4: warning: overflow in implicit
constant conversion [-Woverflow]
sound/soc/codecs/lm49453.c:1193:4: warning: overflow in implicit
constant conversion [-Woverflow]
sound/soc/codecs/lm49453.c:1197:4: warning: overflow in implicit
constant conversion [-Woverflow]

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: M R Swami Reddy <mr.swami.reddy@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/codecs/lm49453.c

index 89bbe037f81f522e828bb747634430ed4f3a5fde..5eb726b3ff1b317a6cc5b7c11b783667216010c6 100644 (file)
@@ -1177,27 +1177,24 @@ static int lm49453_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)
 {
        struct snd_soc_codec *codec = codec_dai->codec;
 
-       int aif_val = 0;
+       u16 aif_val;
        int mode = 0;
        int clk_phase = 0;
        int clk_shift = 0;
 
        switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
        case SND_SOC_DAIFMT_CBS_CFS:
-               aif_val = ~LM49453_AUDIO_PORT1_BASIC_CLK_MS |
-                       ~LM49453_AUDIO_PORT1_BASIC_SYNC_MS;
+               aif_val = 0;
                break;
        case SND_SOC_DAIFMT_CBS_CFM:
-               aif_val = ~LM49453_AUDIO_PORT1_BASIC_CLK_MS |
-                       LM49453_AUDIO_PORT1_BASIC_SYNC_MS;
+               aif_val = LM49453_AUDIO_PORT1_BASIC_SYNC_MS;
                break;
        case SND_SOC_DAIFMT_CBM_CFS:
-               aif_val = LM49453_AUDIO_PORT1_BASIC_CLK_MS |
-                       ~LM49453_AUDIO_PORT1_BASIC_SYNC_MS;
+               aif_val = LM49453_AUDIO_PORT1_BASIC_CLK_MS;
                break;
        case SND_SOC_DAIFMT_CBM_CFM:
                aif_val = LM49453_AUDIO_PORT1_BASIC_CLK_MS |
-                       LM49453_AUDIO_PORT1_BASIC_SYNC_MS;
+                         LM49453_AUDIO_PORT1_BASIC_SYNC_MS;
                break;
        default:
                return -EINVAL;