diff options
author | Randy Dunlap <rdunlap@xenotime.net> | 2012-10-19 19:13:07 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-10-22 09:40:02 -0400 |
commit | 8858086f35d13dcaceeebabcedade0ebbc9e01fa (patch) | |
tree | 00ece6173abb02c8465913e909dde2d043d523f4 | |
parent | 9874482985fb26f90c3b2d8f1a82bd796d141304 (diff) |
ASoC: fix wm2200.c printk format warnings
Fix wm2200.c printk format warnings (seen on x86_64):
sound/soc/codecs/wm2200.c:1027:4: warning: format '%d' expects type 'int', but argument 4 has type 'size_t'
sound/soc/codecs/wm2200.c:1139:5: warning: format '%d' expects type 'int', but argument 5 has type 'long unsigned int'
sound/soc/codecs/wm2200.c:1181:2: warning: format '%d' expects type 'int', but argument 7 has type 'size_t'
sound/soc/codecs/wm2200.c:1201:5: warning: format '%x' expects type 'unsigned int', but argument 3 has type 'long unsigned int'
sound/soc/codecs/wm2200.c:1264:4: warning: format '%d' expects type 'int', but argument 4 has type 'size_t'
sound/soc/codecs/wm2200.c:1328:5: warning: format '%d' expects type 'int', but argument 5 has type 'long unsigned int'
Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r-- | sound/soc/codecs/wm2200.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sound/soc/codecs/wm2200.c b/sound/soc/codecs/wm2200.c index b63391a7dae9..2148ee31cd66 100644 --- a/sound/soc/codecs/wm2200.c +++ b/sound/soc/codecs/wm2200.c | |||
@@ -1023,7 +1023,7 @@ static int wm2200_dsp_load(struct snd_soc_codec *codec, int base) | |||
1023 | 1023 | ||
1024 | pos = sizeof(*header) + sizeof(*adsp1_sizes) + sizeof(*footer); | 1024 | pos = sizeof(*header) + sizeof(*adsp1_sizes) + sizeof(*footer); |
1025 | if (pos >= firmware->size) { | 1025 | if (pos >= firmware->size) { |
1026 | dev_err(codec->dev, "%s: file too short, %d bytes\n", | 1026 | dev_err(codec->dev, "%s: file too short, %zu bytes\n", |
1027 | file, firmware->size); | 1027 | file, firmware->size); |
1028 | return -EINVAL; | 1028 | return -EINVAL; |
1029 | } | 1029 | } |
@@ -1135,7 +1135,7 @@ static int wm2200_dsp_load(struct snd_soc_codec *codec, int base) | |||
1135 | } | 1135 | } |
1136 | 1136 | ||
1137 | if (pos > firmware->size) | 1137 | if (pos > firmware->size) |
1138 | dev_warn(codec->dev, "%s.%d: %d bytes at end of file\n", | 1138 | dev_warn(codec->dev, "%s.%d: %zu bytes at end of file\n", |
1139 | file, regions, pos - firmware->size); | 1139 | file, regions, pos - firmware->size); |
1140 | 1140 | ||
1141 | out: | 1141 | out: |
@@ -1178,7 +1178,7 @@ static int wm2200_setup_algs(struct snd_soc_codec *codec, int base) | |||
1178 | } | 1178 | } |
1179 | 1179 | ||
1180 | algs = be32_to_cpu(id.algs); | 1180 | algs = be32_to_cpu(id.algs); |
1181 | dev_info(codec->dev, "Firmware: %x v%d.%d.%d, %d algorithms\n", | 1181 | dev_info(codec->dev, "Firmware: %x v%d.%d.%d, %zu algorithms\n", |
1182 | be32_to_cpu(id.fw.id), | 1182 | be32_to_cpu(id.fw.id), |
1183 | (be32_to_cpu(id.fw.ver) & 0xff000) >> 16, | 1183 | (be32_to_cpu(id.fw.ver) & 0xff000) >> 16, |
1184 | (be32_to_cpu(id.fw.ver) & 0xff00) >> 8, | 1184 | (be32_to_cpu(id.fw.ver) & 0xff00) >> 8, |
@@ -1196,7 +1196,7 @@ static int wm2200_setup_algs(struct snd_soc_codec *codec, int base) | |||
1196 | } | 1196 | } |
1197 | 1197 | ||
1198 | if (be32_to_cpu(val) != 0xbedead) | 1198 | if (be32_to_cpu(val) != 0xbedead) |
1199 | dev_warn(codec->dev, "Algorithm list end %x 0x%x != 0xbeadead\n", | 1199 | dev_warn(codec->dev, "Algorithm list end %zx 0x%x != 0xbeadead\n", |
1200 | (sizeof(id) + (algs * sizeof(*alg))) / 2, | 1200 | (sizeof(id) + (algs * sizeof(*alg))) / 2, |
1201 | be32_to_cpu(val)); | 1201 | be32_to_cpu(val)); |
1202 | 1202 | ||
@@ -1260,7 +1260,7 @@ static int wm2200_load_coeff(struct snd_soc_codec *codec, int base) | |||
1260 | } | 1260 | } |
1261 | 1261 | ||
1262 | if (sizeof(*hdr) >= firmware->size) { | 1262 | if (sizeof(*hdr) >= firmware->size) { |
1263 | dev_err(codec->dev, "%s: file too short, %d bytes\n", | 1263 | dev_err(codec->dev, "%s: file too short, %zu bytes\n", |
1264 | file, firmware->size); | 1264 | file, firmware->size); |
1265 | return -EINVAL; | 1265 | return -EINVAL; |
1266 | } | 1266 | } |
@@ -1324,7 +1324,7 @@ static int wm2200_load_coeff(struct snd_soc_codec *codec, int base) | |||
1324 | } | 1324 | } |
1325 | 1325 | ||
1326 | if (pos > firmware->size) | 1326 | if (pos > firmware->size) |
1327 | dev_warn(codec->dev, "%s.%d: %d bytes at end of file\n", | 1327 | dev_warn(codec->dev, "%s.%d: %zu bytes at end of file\n", |
1328 | file, blocks, pos - firmware->size); | 1328 | file, blocks, pos - firmware->size); |
1329 | 1329 | ||
1330 | return 0; | 1330 | return 0; |