Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7bcd8487 authored by Liam Girdwood's avatar Liam Girdwood Committed by Mark Brown
Browse files

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: default avatarLiam Girdwood <liam.r.girdwood@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent e5161d79

sound/soc/intel/sst-dsp-priv.h

+5 −2
Original line number Diff line number Diff line
@@ -41,8 +41,10 @@ struct sst_ops { 
	u64 (*read64)(void __iomem *addr, u32 offset);



	/* DSP I/DRAM IO */

	void (*ram_read)(struct sst_dsp *sst, void *dest, void *src, size_t bytes);

	void (*ram_write)(struct sst_dsp *sst, void *dest, void *src, size_t bytes);

	void (*ram_read)(struct sst_dsp *sst, void  *dest, void __iomem *src,

		size_t bytes);

	void (*ram_write)(struct sst_dsp *sst, void __iomem *dest, void *src,

		size_t bytes);



	void (*dump)(struct sst_dsp *);
@@ -295,6 +297,7 @@ struct sst_module *sst_module_get_from_id(struct sst_dsp *dsp, u32 id); 
struct sst_module *sst_mem_block_alloc_scratch(struct sst_dsp *dsp);

void sst_mem_block_free_scratch(struct sst_dsp *dsp,

	struct sst_module *scratch);

int sst_block_module_remove(struct sst_module *module);



/* Register the DSPs memory blocks - would be nice to read from ACPI */

struct sst_mem_block *sst_mem_block_register(struct sst_dsp *dsp, u32 offset,

sound/soc/intel/sst-firmware.c

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
#include "sst-dsp.h"

#include "sst-dsp-priv.h"



static void sst_memcpy32(void *dest, void *src, u32 bytes)

static void sst_memcpy32(volatile void __iomem *dest, void *src, u32 bytes)

{

	u32 i;