summaryrefslogtreecommitdiff
path: root/sound/soc/codecs/lm49453.c
diff options
context:
space:
mode:
authorM R Swami Reddy <mr.swami.reddy@ti.com>2012-04-05 20:54:09 +0530
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-04-05 22:01:19 +0100
commit7e811ae74b12392fd2f6d6dc9bdee020814e2a0e (patch)
treec3fc10dab7869428adf2fa09fd435036555a32fe /sound/soc/codecs/lm49453.c
parenta7fda2ba82b7531158c68f700fa806e645ff3b7c (diff)
ASoC: lm49453: fix build warnings
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>
Diffstat (limited to 'sound/soc/codecs/lm49453.c')
-rw-r--r--sound/soc/codecs/lm49453.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/sound/soc/codecs/lm49453.c b/sound/soc/codecs/lm49453.c
index 89bbe037f81f..5eb726b3ff1b 100644
--- a/sound/soc/codecs/lm49453.c
+++ b/sound/soc/codecs/lm49453.c
@@ -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;