aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorM R Swami Reddy <mr.swami.reddy@ti.com>2012-04-05 11:24:09 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-04-05 17:01:19 -0400
commit7e811ae74b12392fd2f6d6dc9bdee020814e2a0e (patch)
treec3fc10dab7869428adf2fa09fd435036555a32fe
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>
-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)
1177{ 1177{
1178 struct snd_soc_codec *codec = codec_dai->codec; 1178 struct snd_soc_codec *codec = codec_dai->codec;
1179 1179
1180 int aif_val = 0; 1180 u16 aif_val;
1181 int mode = 0; 1181 int mode = 0;
1182 int clk_phase = 0; 1182 int clk_phase = 0;
1183 int clk_shift = 0; 1183 int clk_shift = 0;
1184 1184
1185 switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { 1185 switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
1186 case SND_SOC_DAIFMT_CBS_CFS: 1186 case SND_SOC_DAIFMT_CBS_CFS:
1187 aif_val = ~LM49453_AUDIO_PORT1_BASIC_CLK_MS | 1187 aif_val = 0;
1188 ~LM49453_AUDIO_PORT1_BASIC_SYNC_MS;
1189 break; 1188 break;
1190 case SND_SOC_DAIFMT_CBS_CFM: 1189 case SND_SOC_DAIFMT_CBS_CFM:
1191 aif_val = ~LM49453_AUDIO_PORT1_BASIC_CLK_MS | 1190 aif_val = LM49453_AUDIO_PORT1_BASIC_SYNC_MS;
1192 LM49453_AUDIO_PORT1_BASIC_SYNC_MS;
1193 break; 1191 break;
1194 case SND_SOC_DAIFMT_CBM_CFS: 1192 case SND_SOC_DAIFMT_CBM_CFS:
1195 aif_val = LM49453_AUDIO_PORT1_BASIC_CLK_MS | 1193 aif_val = LM49453_AUDIO_PORT1_BASIC_CLK_MS;
1196 ~LM49453_AUDIO_PORT1_BASIC_SYNC_MS;
1197 break; 1194 break;
1198 case SND_SOC_DAIFMT_CBM_CFM: 1195 case SND_SOC_DAIFMT_CBM_CFM:
1199 aif_val = LM49453_AUDIO_PORT1_BASIC_CLK_MS | 1196 aif_val = LM49453_AUDIO_PORT1_BASIC_CLK_MS |
1200 LM49453_AUDIO_PORT1_BASIC_SYNC_MS; 1197 LM49453_AUDIO_PORT1_BASIC_SYNC_MS;
1201 break; 1198 break;
1202 default: 1199 default:
1203 return -EINVAL; 1200 return -EINVAL;