From: Randy Dunlap <rdunlap@xenotime.net>
Date: Fri, 19 Oct 2012 23:13:07 +0000 (-0700)
Subject: ASoC: fix wm2200.c printk format warnings
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=8858086f35d13dcaceeebabcedade0ebbc9e01fa;p=openwrt%2Fstaging%2Fblogic.git

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>
---

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)
 
 	pos = sizeof(*header) + sizeof(*adsp1_sizes) + sizeof(*footer);
 	if (pos >= firmware->size) {
-		dev_err(codec->dev, "%s: file too short, %d bytes\n",
+		dev_err(codec->dev, "%s: file too short, %zu bytes\n",
 			file, firmware->size);
 		return -EINVAL;
 	}
@@ -1135,7 +1135,7 @@ static int wm2200_dsp_load(struct snd_soc_codec *codec, int base)
 	}
 
 	if (pos > firmware->size)
-		dev_warn(codec->dev, "%s.%d: %d bytes at end of file\n",
+		dev_warn(codec->dev, "%s.%d: %zu bytes at end of file\n",
 			 file, regions, pos - firmware->size);
 
 out:
@@ -1178,7 +1178,7 @@ static int wm2200_setup_algs(struct snd_soc_codec *codec, int base)
 	}
 
 	algs = be32_to_cpu(id.algs);
-	dev_info(codec->dev, "Firmware: %x v%d.%d.%d, %d algorithms\n",
+	dev_info(codec->dev, "Firmware: %x v%d.%d.%d, %zu algorithms\n",
 		 be32_to_cpu(id.fw.id),
 		 (be32_to_cpu(id.fw.ver) & 0xff000) >> 16,
 		 (be32_to_cpu(id.fw.ver) & 0xff00) >> 8,
@@ -1196,7 +1196,7 @@ static int wm2200_setup_algs(struct snd_soc_codec *codec, int base)
 	}
 
 	if (be32_to_cpu(val) != 0xbedead)
-		dev_warn(codec->dev, "Algorithm list end %x 0x%x != 0xbeadead\n",
+		dev_warn(codec->dev, "Algorithm list end %zx 0x%x != 0xbeadead\n",
 			 (sizeof(id) + (algs * sizeof(*alg))) / 2,
 			 be32_to_cpu(val));
 
@@ -1260,7 +1260,7 @@ static int wm2200_load_coeff(struct snd_soc_codec *codec, int base)
 	}
 
 	if (sizeof(*hdr) >= firmware->size) {
-		dev_err(codec->dev, "%s: file too short, %d bytes\n",
+		dev_err(codec->dev, "%s: file too short, %zu bytes\n",
 			file, firmware->size);
 		return -EINVAL;
 	}
@@ -1324,7 +1324,7 @@ static int wm2200_load_coeff(struct snd_soc_codec *codec, int base)
 	}
 
 	if (pos > firmware->size)
-		dev_warn(codec->dev, "%s.%d: %d bytes at end of file\n",
+		dev_warn(codec->dev, "%s.%d: %zu bytes at end of file\n",
 			 file, blocks, pos - firmware->size);
 
 	return 0;