diff options
author | Liam Girdwood <liam.r.girdwood@linux.intel.com> | 2014-02-19 09:06:23 -0500 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-02-19 10:08:24 -0500 |
commit | 7bcd84878ebd87168682b117e1cb9dd8a55a1a8b (patch) | |
tree | 386b59b30d160d45a6906bbe61d40e2ce07f2ecc | |
parent | e5161d7987f14338ad0a3cf376b9bb6838416183 (diff) |
ASoC: Intel: Fix sparse warnings for firmware loader
Sparse gives us the following warnings on sst-firmware.c
CHECK sound/soc/intel/sst-firmware.c
sound/soc/intel/sst-firmware.c:39:34: warning: incorrect type in argument 1 (different address spaces)
sound/soc/intel/sst-firmware.c:39:34: expected void volatile [noderef] <asn:2>*dst
sound/soc/intel/sst-firmware.c:39:34: got void *
sound/soc/intel/sst-firmware.c:417:36: warning: incorrect type in argument 1 (different address spaces)
sound/soc/intel/sst-firmware.c:417:36: expected void *dest
sound/soc/intel/sst-firmware.c:417:36: got void [noderef] <asn:2>*
sound/soc/intel/sst-firmware.c:430:5: warning: symbol 'sst_block_module_remove' was not declared. Should it be static?
and
CC [M] sound/soc/intel/sst-dsp.o
sound/soc/intel/sst-dsp-priv.h:271:53: warning: incorrect type in argument 3 (different address spaces)
sound/soc/intel/sst-dsp-priv.h:271:53: expected void *src
sound/soc/intel/sst-dsp-priv.h:271:53: got void [noderef] <asn:2>*
sound/soc/intel/sst-dsp-priv.h:271:53: warning: incorrect type in argument 3 (different address spaces)
sound/soc/intel/sst-dsp-priv.h:271:53: expected void *src
sound/soc/intel/sst-dsp-priv.h:271:53: got void [noderef] <asn:2>*
sound/soc/intel/sst-dsp-priv.h:271:53: warning: incorrect type in argument 3 (different address spaces)
sound/soc/intel/sst-dsp-priv.h:271:53: expected void *src
sound/soc/intel/sst-dsp-priv.h:271:53: got void [noderef] <asn:2>*
This patch removes these warnings
Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r-- | sound/soc/intel/sst-dsp-priv.h | 7 | ||||
-rw-r--r-- | sound/soc/intel/sst-firmware.c | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/sound/soc/intel/sst-dsp-priv.h b/sound/soc/intel/sst-dsp-priv.h index 35de547f1744..fa2c780c888b 100644 --- a/sound/soc/intel/sst-dsp-priv.h +++ b/sound/soc/intel/sst-dsp-priv.h | |||
@@ -41,8 +41,10 @@ struct sst_ops { | |||
41 | u64 (*read64)(void __iomem *addr, u32 offset); | 41 | u64 (*read64)(void __iomem *addr, u32 offset); |
42 | 42 | ||
43 | /* DSP I/DRAM IO */ | 43 | /* DSP I/DRAM IO */ |
44 | void (*ram_read)(struct sst_dsp *sst, void *dest, void *src, size_t bytes); | 44 | void (*ram_read)(struct sst_dsp *sst, void *dest, void __iomem *src, |
45 | void (*ram_write)(struct sst_dsp *sst, void *dest, void *src, size_t bytes); | 45 | size_t bytes); |
46 | void (*ram_write)(struct sst_dsp *sst, void __iomem *dest, void *src, | ||
47 | size_t bytes); | ||
46 | 48 | ||
47 | void (*dump)(struct sst_dsp *); | 49 | void (*dump)(struct sst_dsp *); |
48 | 50 | ||
@@ -295,6 +297,7 @@ struct sst_module *sst_module_get_from_id(struct sst_dsp *dsp, u32 id); | |||
295 | struct sst_module *sst_mem_block_alloc_scratch(struct sst_dsp *dsp); | 297 | struct sst_module *sst_mem_block_alloc_scratch(struct sst_dsp *dsp); |
296 | void sst_mem_block_free_scratch(struct sst_dsp *dsp, | 298 | void sst_mem_block_free_scratch(struct sst_dsp *dsp, |
297 | struct sst_module *scratch); | 299 | struct sst_module *scratch); |
300 | int sst_block_module_remove(struct sst_module *module); | ||
298 | 301 | ||
299 | /* Register the DSPs memory blocks - would be nice to read from ACPI */ | 302 | /* Register the DSPs memory blocks - would be nice to read from ACPI */ |
300 | struct sst_mem_block *sst_mem_block_register(struct sst_dsp *dsp, u32 offset, | 303 | struct sst_mem_block *sst_mem_block_register(struct sst_dsp *dsp, u32 offset, |
diff --git a/sound/soc/intel/sst-firmware.c b/sound/soc/intel/sst-firmware.c index 31cd15430e9a..dee7eb5befb7 100644 --- a/sound/soc/intel/sst-firmware.c +++ b/sound/soc/intel/sst-firmware.c | |||
@@ -30,7 +30,7 @@ | |||
30 | #include "sst-dsp.h" | 30 | #include "sst-dsp.h" |
31 | #include "sst-dsp-priv.h" | 31 | #include "sst-dsp-priv.h" |
32 | 32 | ||
33 | static void sst_memcpy32(void *dest, void *src, u32 bytes) | 33 | static void sst_memcpy32(volatile void __iomem *dest, void *src, u32 bytes) |
34 | { | 34 | { |
35 | u32 i; | 35 | u32 i; |
36 | 36 | ||