diff --git a/src/audio/mixin_mixout/mixin_mixout.c b/src/audio/mixin_mixout/mixin_mixout.c index d87438575344..3e34a8443629 100644 --- a/src/audio/mixin_mixout/mixin_mixout.c +++ b/src/audio/mixin_mixout/mixin_mixout.c @@ -121,7 +121,7 @@ static int mixin_init(struct processing_module *mod) static int mixout_init(struct processing_module *mod) { - struct module_source_info __sparse_cache *mod_source_info; + struct module_source_info *mod_source_info; struct comp_dev *dev = mod->dev; struct mixout_data *mo_data; @@ -154,7 +154,7 @@ static int mixin_free(struct processing_module *mod) static int mixout_free(struct processing_module *mod) { - struct module_source_info __sparse_cache *mod_source_info; + struct module_source_info *mod_source_info; comp_dbg(mod->dev, "mixout_free()"); @@ -280,7 +280,7 @@ static int mixin_process(struct processing_module *mod, struct comp_buffer *sink; struct mixout_data *mixout_data; struct processing_module *mixout_mod; - struct module_source_info __sparse_cache *mod_source_info; + struct module_source_info *mod_source_info; uint32_t free_frames, pending_frames; /* unused buffer between mixin and mixout */ @@ -355,7 +355,7 @@ static int mixin_process(struct processing_module *mod, struct comp_dev *mixout; struct comp_buffer *sink; struct mixout_data *mixout_data; - struct module_source_info __sparse_cache *mod_source_info; + struct module_source_info *mod_source_info; struct processing_module *mixout_mod; uint32_t start_frame; uint32_t writeback_size; @@ -427,7 +427,7 @@ static int mixout_process(struct processing_module *mod, struct input_stream_buffer *input_buffers, int num_input_buffers, struct output_stream_buffer *output_buffers, int num_output_buffers) { - struct module_source_info __sparse_cache *mod_source_info; + struct module_source_info *mod_source_info; struct comp_dev *dev = mod->dev; struct mixout_data *md; uint32_t frames_to_produce = INT32_MAX; @@ -716,7 +716,7 @@ static int mixout_prepare(struct processing_module *mod, struct sof_source **sources, int num_of_sources, struct sof_sink **sinks, int num_of_sinks) { - struct module_source_info __sparse_cache *mod_source_info; + struct module_source_info *mod_source_info; struct comp_dev *dev = mod->dev; struct mixout_data *md; int ret, i; diff --git a/src/audio/module_adapter/module_adapter.c b/src/audio/module_adapter/module_adapter.c index bed3bca2e0ce..fd2afb05ffcb 100644 --- a/src/audio/module_adapter/module_adapter.c +++ b/src/audio/module_adapter/module_adapter.c @@ -1634,7 +1634,7 @@ static bool module_adapter_multi_sink_source_check(struct comp_dev *dev) int module_adapter_bind(struct comp_dev *dev, void *data) { - struct module_source_info __sparse_cache *mod_source_info; + struct module_source_info *mod_source_info; struct processing_module *mod = comp_get_drvdata(dev); struct ipc4_module_bind_unbind *bu; struct comp_dev *source_dev; diff --git a/src/include/sof/audio/module_adapter/module/generic.h b/src/include/sof/audio/module_adapter/module/generic.h index 4ec12fd7b531..78b62813e008 100644 --- a/src/include/sof/audio/module_adapter/module/generic.h +++ b/src/include/sof/audio/module_adapter/module/generic.h @@ -336,7 +336,7 @@ struct module_source_info *module_source_info_acquire(struct module_source_info return container_of(c, struct module_source_info, c); } -static inline void module_source_info_release(struct module_source_info __sparse_cache *msi) +static inline void module_source_info_release(struct module_source_info *msi) { coherent_release_thread(&msi->c, sizeof(*msi)); } diff --git a/src/include/sof/coherent.h b/src/include/sof/coherent.h index 4ca5120cfee9..2b336d3aaa5e 100644 --- a/src/include/sof/coherent.h +++ b/src/include/sof/coherent.h @@ -307,7 +307,7 @@ static inline void __coherent_shared_thread(struct coherent *c, const size_t siz /* * Coherent devices only require locking to manage shared access. */ -__must_check static inline struct coherent __sparse_cache *coherent_acquire(struct coherent *c, +__must_check static inline struct coherent *coherent_acquire(struct coherent *c, const size_t size) { if (c->shared) { @@ -319,7 +319,7 @@ __must_check static inline struct coherent __sparse_cache *coherent_acquire(stru dcache_invalidate_region(cc, size); } - return (__sparse_force struct coherent __sparse_cache *)c; + return c; } static inline void coherent_release(struct coherent __sparse_cache *c,