Message ID | 20210326215927.936377-14-pierre-louis.bossart@linux.intel.com (mailing list archive) |
---|---|
State | Accepted |
Commit | 53567ebce407639e3657b5c232bd60970a66f82c |
Headers | show |
Series | ASoC: remove cppcheck warnings for multiple SOCs | expand |
On Fri, Mar 26, 2021 at 04:59:23PM -0500, Pierre-Louis Bossart wrote: > cppcheck warnings: > > sound/soc/tegra/tegra20_das.c:35:40: style:inconclusive: Function > 'tegra20_das_connect_dap_to_dac' argument 1 names different: > declaration 'dap_id' definition 'dap'. [funcArgNamesDifferent] > > int tegra20_das_connect_dap_to_dac(int dap, int dac) > ^ > sound/soc/tegra/tegra20_das.h:98:47: note: Function > 'tegra20_das_connect_dap_to_dac' argument 1 names different: > declaration 'dap_id' definition 'dap'. > extern int tegra20_das_connect_dap_to_dac(int dap_id, int dac_sel); > ^ > sound/soc/tegra/tegra20_das.c:35:40: note: Function > 'tegra20_das_connect_dap_to_dac' argument 1 names different: > declaration 'dap_id' definition 'dap'. > int tegra20_das_connect_dap_to_dac(int dap, int dac) > ^ > sound/soc/tegra/tegra20_das.c:35:49: style:inconclusive: Function > 'tegra20_das_connect_dap_to_dac' argument 2 names different: > declaration 'dac_sel' definition 'dac'. [funcArgNamesDifferent] > int tegra20_das_connect_dap_to_dac(int dap, int dac) > ^ > sound/soc/tegra/tegra20_das.h:98:59: note: Function > 'tegra20_das_connect_dap_to_dac' argument 2 names different: > declaration 'dac_sel' definition 'dac'. > extern int tegra20_das_connect_dap_to_dac(int dap_id, int dac_sel); > ^ > sound/soc/tegra/tegra20_das.c:35:49: note: Function 'tegra20_das_connect_dap_to_dac' argument 2 names different: declaration 'dac_sel' definition 'dac'. > int tegra20_das_connect_dap_to_dac(int dap, int dac) > ^ > sound/soc/tegra/tegra20_das.c:53:40: style:inconclusive: Function > 'tegra20_das_connect_dap_to_dap' argument 1 names different: > declaration 'dap_id' definition 'dap'. [funcArgNamesDifferent] > int tegra20_das_connect_dap_to_dap(int dap, int otherdap, int master, > ^ > sound/soc/tegra/tegra20_das.h:108:47: note: Function > 'tegra20_das_connect_dap_to_dap' argument 1 names different: > declaration 'dap_id' definition 'dap'. > extern int tegra20_das_connect_dap_to_dap(int dap_id, int other_dap_sel, > ^ > sound/soc/tegra/tegra20_das.c:53:40: note: Function > 'tegra20_das_connect_dap_to_dap' argument 1 names different: > declaration 'dap_id' definition 'dap'. > int tegra20_das_connect_dap_to_dap(int dap, int otherdap, int master, > ^ > sound/soc/tegra/tegra20_das.c:53:49: style:inconclusive: Function > 'tegra20_das_connect_dap_to_dap' argument 2 names different: > declaration 'other_dap_sel' definition > 'otherdap'. [funcArgNamesDifferent] > int tegra20_das_connect_dap_to_dap(int dap, int otherdap, int master, > ^ > sound/soc/tegra/tegra20_das.h:108:59: note: Function > 'tegra20_das_connect_dap_to_dap' argument 2 names different: > declaration 'other_dap_sel' definition 'otherdap'. > extern int tegra20_das_connect_dap_to_dap(int dap_id, int other_dap_sel, > ^ > sound/soc/tegra/tegra20_das.c:53:49: note: Function > 'tegra20_das_connect_dap_to_dap' argument 2 names different: > declaration 'other_dap_sel' definition 'otherdap'. > int tegra20_das_connect_dap_to_dap(int dap, int otherdap, int master, > ^ > sound/soc/tegra/tegra20_das.c:75:40: style:inconclusive: Function > 'tegra20_das_connect_dac_to_dap' argument 1 names different: > declaration 'dac_id' definition 'dac'. [funcArgNamesDifferent] > int tegra20_das_connect_dac_to_dap(int dac, int dap) > ^ > sound/soc/tegra/tegra20_das.h:118:47: note: Function > 'tegra20_das_connect_dac_to_dap' argument 1 names different: > declaration 'dac_id' definition 'dac'. > extern int tegra20_das_connect_dac_to_dap(int dac_id, int dap_sel); > ^ > sound/soc/tegra/tegra20_das.c:75:40: note: Function > 'tegra20_das_connect_dac_to_dap' argument 1 names different: > declaration 'dac_id' definition 'dac'. > int tegra20_das_connect_dac_to_dap(int dac, int dap) > ^ > sound/soc/tegra/tegra20_das.c:75:49: style:inconclusive: Function > 'tegra20_das_connect_dac_to_dap' argument 2 names different: > declaration 'dap_sel' definition 'dap'. [funcArgNamesDifferent] > int tegra20_das_connect_dac_to_dap(int dac, int dap) > ^ > sound/soc/tegra/tegra20_das.h:118:59: note: Function > 'tegra20_das_connect_dac_to_dap' argument 2 names different: > declaration 'dap_sel' definition 'dap'. > extern int tegra20_das_connect_dac_to_dap(int dac_id, int dap_sel); > ^ > sound/soc/tegra/tegra20_das.c:75:49: note: Function > 'tegra20_das_connect_dac_to_dap' argument 2 names different: > declaration 'dap_sel' definition 'dap'. > int tegra20_das_connect_dac_to_dap(int dac, int dap) > ^ > > Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> > --- > sound/soc/tegra/tegra20_das.h | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) Acked-by: Thierry Reding <treding@nvidia.com>
diff --git a/sound/soc/tegra/tegra20_das.h b/sound/soc/tegra/tegra20_das.h index d22abc4d08e6..18e832ded73a 100644 --- a/sound/soc/tegra/tegra20_das.h +++ b/sound/soc/tegra/tegra20_das.h @@ -95,7 +95,7 @@ struct tegra20_das { * dap_id: DAP to connect: TEGRA20_DAS_DAP_ID_* * dac_sel: DAC to connect to: TEGRA20_DAS_DAP_SEL_DAC* */ -extern int tegra20_das_connect_dap_to_dac(int dap_id, int dac_sel); +extern int tegra20_das_connect_dap_to_dac(int dap, int dac); /* * Connect a DAP to another DAP @@ -105,7 +105,7 @@ extern int tegra20_das_connect_dap_to_dac(int dap_id, int dac_sel); * sdata1rx: Is this DAP's SDATA1 pin RX (1) or TX (0) * sdata2rx: Is this DAP's SDATA2 pin RX (1) or TX (0) */ -extern int tegra20_das_connect_dap_to_dap(int dap_id, int other_dap_sel, +extern int tegra20_das_connect_dap_to_dap(int dap, int otherdap, int master, int sdata1rx, int sdata2rx); @@ -115,6 +115,6 @@ extern int tegra20_das_connect_dap_to_dap(int dap_id, int other_dap_sel, * dac_id: DAC ID to connect: TEGRA20_DAS_DAC_ID_* * dap_sel: DAP to receive input from: TEGRA20_DAS_DAC_SEL_DAP* */ -extern int tegra20_das_connect_dac_to_dap(int dac_id, int dap_sel); +extern int tegra20_das_connect_dac_to_dap(int dac, int dap); #endif
cppcheck warnings: sound/soc/tegra/tegra20_das.c:35:40: style:inconclusive: Function 'tegra20_das_connect_dap_to_dac' argument 1 names different: declaration 'dap_id' definition 'dap'. [funcArgNamesDifferent] int tegra20_das_connect_dap_to_dac(int dap, int dac) ^ sound/soc/tegra/tegra20_das.h:98:47: note: Function 'tegra20_das_connect_dap_to_dac' argument 1 names different: declaration 'dap_id' definition 'dap'. extern int tegra20_das_connect_dap_to_dac(int dap_id, int dac_sel); ^ sound/soc/tegra/tegra20_das.c:35:40: note: Function 'tegra20_das_connect_dap_to_dac' argument 1 names different: declaration 'dap_id' definition 'dap'. int tegra20_das_connect_dap_to_dac(int dap, int dac) ^ sound/soc/tegra/tegra20_das.c:35:49: style:inconclusive: Function 'tegra20_das_connect_dap_to_dac' argument 2 names different: declaration 'dac_sel' definition 'dac'. [funcArgNamesDifferent] int tegra20_das_connect_dap_to_dac(int dap, int dac) ^ sound/soc/tegra/tegra20_das.h:98:59: note: Function 'tegra20_das_connect_dap_to_dac' argument 2 names different: declaration 'dac_sel' definition 'dac'. extern int tegra20_das_connect_dap_to_dac(int dap_id, int dac_sel); ^ sound/soc/tegra/tegra20_das.c:35:49: note: Function 'tegra20_das_connect_dap_to_dac' argument 2 names different: declaration 'dac_sel' definition 'dac'. int tegra20_das_connect_dap_to_dac(int dap, int dac) ^ sound/soc/tegra/tegra20_das.c:53:40: style:inconclusive: Function 'tegra20_das_connect_dap_to_dap' argument 1 names different: declaration 'dap_id' definition 'dap'. [funcArgNamesDifferent] int tegra20_das_connect_dap_to_dap(int dap, int otherdap, int master, ^ sound/soc/tegra/tegra20_das.h:108:47: note: Function 'tegra20_das_connect_dap_to_dap' argument 1 names different: declaration 'dap_id' definition 'dap'. extern int tegra20_das_connect_dap_to_dap(int dap_id, int other_dap_sel, ^ sound/soc/tegra/tegra20_das.c:53:40: note: Function 'tegra20_das_connect_dap_to_dap' argument 1 names different: declaration 'dap_id' definition 'dap'. int tegra20_das_connect_dap_to_dap(int dap, int otherdap, int master, ^ sound/soc/tegra/tegra20_das.c:53:49: style:inconclusive: Function 'tegra20_das_connect_dap_to_dap' argument 2 names different: declaration 'other_dap_sel' definition 'otherdap'. [funcArgNamesDifferent] int tegra20_das_connect_dap_to_dap(int dap, int otherdap, int master, ^ sound/soc/tegra/tegra20_das.h:108:59: note: Function 'tegra20_das_connect_dap_to_dap' argument 2 names different: declaration 'other_dap_sel' definition 'otherdap'. extern int tegra20_das_connect_dap_to_dap(int dap_id, int other_dap_sel, ^ sound/soc/tegra/tegra20_das.c:53:49: note: Function 'tegra20_das_connect_dap_to_dap' argument 2 names different: declaration 'other_dap_sel' definition 'otherdap'. int tegra20_das_connect_dap_to_dap(int dap, int otherdap, int master, ^ sound/soc/tegra/tegra20_das.c:75:40: style:inconclusive: Function 'tegra20_das_connect_dac_to_dap' argument 1 names different: declaration 'dac_id' definition 'dac'. [funcArgNamesDifferent] int tegra20_das_connect_dac_to_dap(int dac, int dap) ^ sound/soc/tegra/tegra20_das.h:118:47: note: Function 'tegra20_das_connect_dac_to_dap' argument 1 names different: declaration 'dac_id' definition 'dac'. extern int tegra20_das_connect_dac_to_dap(int dac_id, int dap_sel); ^ sound/soc/tegra/tegra20_das.c:75:40: note: Function 'tegra20_das_connect_dac_to_dap' argument 1 names different: declaration 'dac_id' definition 'dac'. int tegra20_das_connect_dac_to_dap(int dac, int dap) ^ sound/soc/tegra/tegra20_das.c:75:49: style:inconclusive: Function 'tegra20_das_connect_dac_to_dap' argument 2 names different: declaration 'dap_sel' definition 'dap'. [funcArgNamesDifferent] int tegra20_das_connect_dac_to_dap(int dac, int dap) ^ sound/soc/tegra/tegra20_das.h:118:59: note: Function 'tegra20_das_connect_dac_to_dap' argument 2 names different: declaration 'dap_sel' definition 'dap'. extern int tegra20_das_connect_dac_to_dap(int dac_id, int dap_sel); ^ sound/soc/tegra/tegra20_das.c:75:49: note: Function 'tegra20_das_connect_dac_to_dap' argument 2 names different: declaration 'dap_sel' definition 'dap'. int tegra20_das_connect_dac_to_dap(int dac, int dap) ^ Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> --- sound/soc/tegra/tegra20_das.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)