From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
To: alsa-devel@alsa-project.org
Cc: tiwai@suse.de, broonie@kernel.org,
Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Subject: [PATCH 21/21] ASoC: Intel: Skylake: (cosmetic) align function parameters
Date: Thu, 13 Aug 2020 15:01:47 -0500 [thread overview]
Message-ID: <20200813200147.61990-22-pierre-louis.bossart@linux.intel.com> (raw)
In-Reply-To: <20200813200147.61990-1-pierre-louis.bossart@linux.intel.com>
Fix cppcheck warnings and align headers with code.
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
---
sound/soc/intel/skylake/cnl-sst-dsp.h | 4 ++--
sound/soc/intel/skylake/skl-sst-ipc.h | 16 ++++++++--------
sound/soc/intel/skylake/skl-topology.h | 8 ++++----
sound/soc/intel/skylake/skl.h | 2 +-
4 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/sound/soc/intel/skylake/cnl-sst-dsp.h b/sound/soc/intel/skylake/cnl-sst-dsp.h
index 7bd4d2a8fdfa..d3cf4bd1a070 100644
--- a/sound/soc/intel/skylake/cnl-sst-dsp.h
+++ b/sound/soc/intel/skylake/cnl-sst-dsp.h
@@ -82,8 +82,8 @@ struct sst_generic_ipc;
#define CNL_ADSPCS_CPA_SHIFT 24
#define CNL_ADSPCS_CPA(x) (x << CNL_ADSPCS_CPA_SHIFT)
-int cnl_dsp_enable_core(struct sst_dsp *ctx, unsigned int core);
-int cnl_dsp_disable_core(struct sst_dsp *ctx, unsigned int core);
+int cnl_dsp_enable_core(struct sst_dsp *ctx, unsigned int core_mask);
+int cnl_dsp_disable_core(struct sst_dsp *ctx, unsigned int core_mask);
irqreturn_t cnl_dsp_sst_interrupt(int irq, void *dev_id);
void cnl_dsp_free(struct sst_dsp *dsp);
diff --git a/sound/soc/intel/skylake/skl-sst-ipc.h b/sound/soc/intel/skylake/skl-sst-ipc.h
index 08ac31778325..aaaab3b3ec42 100644
--- a/sound/soc/intel/skylake/skl-sst-ipc.h
+++ b/sound/soc/intel/skylake/skl-sst-ipc.h
@@ -107,12 +107,12 @@ struct skl_ipc_d0ix_msg {
irqreturn_t skl_dsp_irq_thread_handler(int irq, void *context);
-int skl_ipc_create_pipeline(struct sst_generic_ipc *sst_ipc,
+int skl_ipc_create_pipeline(struct sst_generic_ipc *ipc,
u16 ppl_mem_size, u8 ppl_type, u8 instance_id, u8 lp_mode);
-int skl_ipc_delete_pipeline(struct sst_generic_ipc *sst_ipc, u8 instance_id);
+int skl_ipc_delete_pipeline(struct sst_generic_ipc *ipc, u8 instance_id);
-int skl_ipc_set_pipeline_state(struct sst_generic_ipc *sst_ipc,
+int skl_ipc_set_pipeline_state(struct sst_generic_ipc *ipc,
u8 instance_id, enum skl_ipc_pipeline_state state);
int skl_ipc_save_pipeline(struct sst_generic_ipc *ipc,
@@ -120,10 +120,10 @@ int skl_ipc_save_pipeline(struct sst_generic_ipc *ipc,
int skl_ipc_restore_pipeline(struct sst_generic_ipc *ipc, u8 instance_id);
-int skl_ipc_init_instance(struct sst_generic_ipc *sst_ipc,
+int skl_ipc_init_instance(struct sst_generic_ipc *ipc,
struct skl_ipc_init_instance_msg *msg, void *param_data);
-int skl_ipc_bind_unbind(struct sst_generic_ipc *sst_ipc,
+int skl_ipc_bind_unbind(struct sst_generic_ipc *ipc,
struct skl_ipc_bind_unbind_msg *msg);
int skl_ipc_load_modules(struct sst_generic_ipc *ipc,
@@ -150,12 +150,12 @@ int skl_ipc_set_d0ix(struct sst_generic_ipc *ipc,
int skl_ipc_check_D0i0(struct sst_dsp *dsp, bool state);
-void skl_ipc_int_enable(struct sst_dsp *dsp);
+void skl_ipc_int_enable(struct sst_dsp *ctx);
void skl_ipc_op_int_enable(struct sst_dsp *ctx);
void skl_ipc_op_int_disable(struct sst_dsp *ctx);
-void skl_ipc_int_disable(struct sst_dsp *dsp);
+void skl_ipc_int_disable(struct sst_dsp *ctx);
-bool skl_ipc_int_status(struct sst_dsp *dsp);
+bool skl_ipc_int_status(struct sst_dsp *ctx);
void skl_ipc_free(struct sst_generic_ipc *ipc);
int skl_ipc_init(struct device *dev, struct skl_dev *skl);
void skl_clear_module_cnt(struct sst_dsp *ctx);
diff --git a/sound/soc/intel/skylake/skl-topology.h b/sound/soc/intel/skylake/skl-topology.h
index 5e93ad85e06d..fb011862fb24 100644
--- a/sound/soc/intel/skylake/skl-topology.h
+++ b/sound/soc/intel/skylake/skl-topology.h
@@ -453,7 +453,7 @@ int skl_dsp_set_dma_control(struct skl_dev *skl, u32 *caps,
void skl_tplg_set_be_dmic_config(struct snd_soc_dai *dai,
struct skl_pipe_params *params, int stream);
int skl_tplg_init(struct snd_soc_component *component,
- struct hdac_bus *ebus);
+ struct hdac_bus *bus);
void skl_tplg_exit(struct snd_soc_component *component,
struct hdac_bus *bus);
struct skl_module_cfg *skl_tplg_fe_get_cpr_module(
@@ -476,13 +476,13 @@ int skl_stop_pipe(struct skl_dev *skl, struct skl_pipe *pipe);
int skl_reset_pipe(struct skl_dev *skl, struct skl_pipe *pipe);
-int skl_init_module(struct skl_dev *skl, struct skl_module_cfg *module_config);
+int skl_init_module(struct skl_dev *skl, struct skl_module_cfg *mconfig);
int skl_bind_modules(struct skl_dev *skl, struct skl_module_cfg
- *src_module, struct skl_module_cfg *dst_module);
+ *src_mcfg, struct skl_module_cfg *dst_mcfg);
int skl_unbind_modules(struct skl_dev *skl, struct skl_module_cfg
- *src_module, struct skl_module_cfg *dst_module);
+ *src_mcfg, struct skl_module_cfg *dst_mcfg);
int skl_set_module_params(struct skl_dev *skl, u32 *params, int size,
u32 param_id, struct skl_module_cfg *mcfg);
diff --git a/sound/soc/intel/skylake/skl.h b/sound/soc/intel/skylake/skl.h
index 26057f38a014..857ea17e3c9f 100644
--- a/sound/soc/intel/skylake/skl.h
+++ b/sound/soc/intel/skylake/skl.h
@@ -166,7 +166,7 @@ int skl_platform_unregister(struct device *dev);
int skl_platform_register(struct device *dev);
struct nhlt_specific_cfg *skl_get_ep_blob(struct skl_dev *skl, u32 instance,
- u8 link_type, u8 s_fmt, u8 no_ch,
+ u8 link_type, u8 s_fmt, u8 num_ch,
u32 s_rate, u8 dirn, u8 dev_type);
int skl_nhlt_update_topology_bin(struct skl_dev *skl);
--
2.25.1
next prev parent reply other threads:[~2020-08-13 20:15 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-13 20:01 [PATCH 00/21] ASoC: Intel: fix cppcheck warnings Pierre-Louis Bossart
2020-08-13 20:01 ` [PATCH 01/21] ASoC: Intel: Atom: sst-atom-controls: remove redundant assignments Pierre-Louis Bossart
2020-08-13 20:01 ` [PATCH 02/21] ASoC: Intel: Atom: compress: remove redundant assignment Pierre-Louis Bossart
2020-08-13 20:01 ` [PATCH 03/21] ASoC: Intel: Atom: platform-pcm: " Pierre-Louis Bossart
2020-08-13 20:01 ` [PATCH 04/21] ASoC: Intel: Atom: sst: remove useless NULL assignment Pierre-Louis Bossart
2020-08-13 20:01 ` [PATCH 05/21] ASoC: Intel: Atom: remove redundant initialization Pierre-Louis Bossart
2020-08-13 20:01 ` [PATCH 06/21] ASoC: Intel: Atom: sst_pvt: " Pierre-Louis Bossart
2020-08-13 20:01 ` [PATCH 07/21] ASoC: Intel: Atom: platform-pcm: fix redundant return Pierre-Louis Bossart
2020-08-13 20:01 ` [PATCH 08/21] ASoC: Intel: Atom: remove useless assignment Pierre-Louis Bossart
2020-08-13 20:01 ` [PATCH 09/21] ASoC: Intel: Atom: sst_loader: remove always-true condition Pierre-Louis Bossart
2020-08-13 20:01 ` [PATCH 10/21] ASoC: Intel: Atom: sst_pvt: simplify return handling Pierre-Louis Bossart
2020-08-13 20:01 ` [PATCH 11/21] ASoC: Intel: Atom: (cosmetic) align parameters Pierre-Louis Bossart
2020-08-13 20:01 ` [PATCH 12/21] ASoC: Intel: Baytrail: (cosmetic) align function parameters Pierre-Louis Bossart
2020-08-13 20:01 ` [PATCH 13/21] ASoC: Intel: common: " Pierre-Louis Bossart
2020-08-13 20:01 ` [PATCH 14/21] ASoC: Intel: haswell: " Pierre-Louis Bossart
2020-08-13 20:01 ` [PATCH 15/21] ASoC: Intel: haswell-ipc: remove redundant assignments Pierre-Louis Bossart
2020-08-13 20:01 ` [PATCH 16/21] ASoC: Intel: Skylake: skl-nhlt: remove redundant initialization Pierre-Louis Bossart
2020-08-13 20:01 ` [PATCH 17/21] ASoC: Intel: Skylake: cldma: " Pierre-Louis Bossart
2020-08-13 20:01 ` [PATCH 18/21] ASoC: Intel: Skylake: sst-utils: remove redundant assignment Pierre-Louis Bossart
2020-08-13 20:01 ` [PATCH 19/21] ASoC: Intel: Skylake: skl-topology: remove redundant assignments Pierre-Louis Bossart
2020-08-13 20:01 ` [PATCH 20/21] ASoC: Intel: Skylake: skl-topology: remove redundant assignment Pierre-Louis Bossart
2020-08-13 20:01 ` Pierre-Louis Bossart [this message]
2020-08-18 16:54 ` [PATCH 00/21] ASoC: Intel: fix cppcheck warnings Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200813200147.61990-22-pierre-louis.bossart@linux.intel.com \
--to=pierre-louis.bossart@linux.intel.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=tiwai@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.