diff options
author | Mark Brown <broonie@kernel.org> | 2020-08-18 14:53:02 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2020-08-18 14:53:02 +0100 |
commit | 5ca8f9a5399670ff9daa6c0282d215cc2ffcd6ff (patch) | |
tree | efc9141e0c8d04a3b87aa2bdddeea030b3d78bd2 /sound/soc/intel/common | |
parent | ba3e069fc12c4b4947f9e6eae425ed6fdf5fae82 (diff) | |
parent | 8f0ccd59bcc9305241507cb48c6aaa08a9f375c8 (diff) | |
download | linux-5ca8f9a5399670ff9daa6c0282d215cc2ffcd6ff.tar.bz2 |
Merge series "ASoC: Intel: fix cppcheck warnings" from Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>:
This patchset tries to reduce the number of warnings on those drivers,
so that cppcheck can become a viable tool to detect issues (currently
hundreds of reports).
Most of the problems are related to unnecessary/redundant variable
assignments, prototypes and one nice logical mistake resulting in an
always-true condition.
Pierre-Louis Bossart (21):
ASoC: Intel: Atom: sst-atom-controls: remove redundant assignments
ASoC: Intel: Atom: compress: remove redundant assignment
ASoC: Intel: Atom: platform-pcm: remove redundant assignment
ASoC: Intel: Atom: sst: remove useless NULL assignment
ASoC: Intel: Atom: remove redundant initialization
ASoC: Intel: Atom: sst_pvt: remove redundant initialization
ASoC: Intel: Atom: platform-pcm: fix redundant return
ASoC: Intel: Atom: remove useless assignment
ASoC: Intel: Atom: sst_loader: remove always-true condition
ASoC: Intel: Atom: sst_pvt: simplify return handling
ASoC: Intel: Atom: (cosmetic) align parameters
ASoC: Intel: Baytrail: (cosmetic) align function parameters
ASoC: Intel: common: (cosmetic) align function parameters
ASoC: Intel: haswell: (cosmetic) align function parameters
ASoC: Intel: haswell-ipc: remove redundant assignments
ASoC: Intel: Skylake: skl-nhlt: remove redundant initialization
ASoC: Intel: Skylake: cldma: remove redundant initialization
ASoC: Intel: Skylake: sst-utils: remove redundant assignment
ASoC: Intel: Skylake: skl-topology: remove redundant assignments
ASoC: Intel: Skylake: skl-topology: remove redundant assignment
ASoC: Intel: Skylake: (cosmetic) align function parameters
sound/soc/intel/atom/sst-atom-controls.c | 4 +--
.../intel/atom/sst-mfld-platform-compress.c | 3 +-
sound/soc/intel/atom/sst-mfld-platform-pcm.c | 4 +--
sound/soc/intel/atom/sst-mfld-platform.h | 4 +--
sound/soc/intel/atom/sst/sst.c | 5 ++-
sound/soc/intel/atom/sst/sst.h | 34 +++++++++----------
sound/soc/intel/atom/sst/sst_loader.c | 3 +-
sound/soc/intel/atom/sst/sst_pvt.c | 4 +--
sound/soc/intel/baytrail/sst-baytrail-ipc.h | 3 +-
sound/soc/intel/common/sst-dsp-priv.h | 2 +-
sound/soc/intel/common/sst-dsp.h | 15 ++++----
sound/soc/intel/haswell/sst-haswell-ipc.c | 4 +--
sound/soc/intel/haswell/sst-haswell-ipc.h | 2 +-
sound/soc/intel/skylake/cnl-sst-dsp.h | 4 +--
sound/soc/intel/skylake/skl-nhlt.c | 2 +-
sound/soc/intel/skylake/skl-sst-cldma.c | 2 +-
sound/soc/intel/skylake/skl-sst-ipc.h | 16 ++++-----
sound/soc/intel/skylake/skl-sst-utils.c | 2 +-
sound/soc/intel/skylake/skl-topology.c | 8 ++---
sound/soc/intel/skylake/skl-topology.h | 8 ++---
sound/soc/intel/skylake/skl.h | 2 +-
21 files changed, 63 insertions(+), 68 deletions(-)
--
2.25.1
Diffstat (limited to 'sound/soc/intel/common')
-rw-r--r-- | sound/soc/intel/common/sst-dsp-priv.h | 2 | ||||
-rw-r--r-- | sound/soc/intel/common/sst-dsp.h | 15 |
2 files changed, 8 insertions, 9 deletions
diff --git a/sound/soc/intel/common/sst-dsp-priv.h b/sound/soc/intel/common/sst-dsp-priv.h index 3d8765ce3e0d..9a760123b46f 100644 --- a/sound/soc/intel/common/sst-dsp-priv.h +++ b/sound/soc/intel/common/sst-dsp-priv.h @@ -344,7 +344,7 @@ void sst_fw_unload(struct sst_fw *sst_fw); /* Create/Free firmware modules */ struct sst_module *sst_module_new(struct sst_fw *sst_fw, struct sst_module_template *template, void *private); -void sst_module_free(struct sst_module *module); +void sst_module_free(struct sst_module *sst_module); struct sst_module *sst_module_get_from_id(struct sst_dsp *dsp, u32 id); int sst_module_alloc_blocks(struct sst_module *module); int sst_module_free_blocks(struct sst_module *module); diff --git a/sound/soc/intel/common/sst-dsp.h b/sound/soc/intel/common/sst-dsp.h index 604a80c5859b..d55014587415 100644 --- a/sound/soc/intel/common/sst-dsp.h +++ b/sound/soc/intel/common/sst-dsp.h @@ -268,15 +268,14 @@ void sst_dsp_ipc_msg_tx(struct sst_dsp *dsp, u32 msg); u32 sst_dsp_ipc_msg_rx(struct sst_dsp *dsp); /* Mailbox management */ -int sst_dsp_mailbox_init(struct sst_dsp *dsp, u32 inbox_offset, +int sst_dsp_mailbox_init(struct sst_dsp *sst, u32 inbox_offset, size_t inbox_size, u32 outbox_offset, size_t outbox_size); -void sst_dsp_inbox_write(struct sst_dsp *dsp, void *message, size_t bytes); -void sst_dsp_inbox_read(struct sst_dsp *dsp, void *message, size_t bytes); -void sst_dsp_outbox_write(struct sst_dsp *dsp, void *message, size_t bytes); -void sst_dsp_outbox_read(struct sst_dsp *dsp, void *message, size_t bytes); -void sst_dsp_mailbox_dump(struct sst_dsp *dsp, size_t bytes); -int sst_dsp_register_poll(struct sst_dsp *dsp, u32 offset, u32 mask, - u32 expected_value, u32 timeout, char *operation); +void sst_dsp_inbox_write(struct sst_dsp *sst, void *message, size_t bytes); +void sst_dsp_inbox_read(struct sst_dsp *sst, void *message, size_t bytes); +void sst_dsp_outbox_write(struct sst_dsp *sst, void *message, size_t bytes); +void sst_dsp_outbox_read(struct sst_dsp *sst, void *message, size_t bytes); +int sst_dsp_register_poll(struct sst_dsp *ctx, u32 offset, u32 mask, + u32 target, u32 time, char *operation); /* Debug */ void sst_dsp_dump(struct sst_dsp *sst); |