Unverified Commit 3766623b authored by Mark Brown's avatar Mark Brown
Browse files

Merge series "ASoC: sh: remove cppcheck warnings" from Pierre-Louis Bossart... 

Merge series "ASoC: sh: remove cppcheck warnings" from Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>:

No functional changes except for patch 4 where a missing error check
was added for consistency.

Pierre-Louis Bossart (8):
  ASoC: sh: dma-sh7760: remove unused variable
  ASoC: sh: rcar: align function prototypes
  ASoC: sh: rcar: simplify return
  ASoC: sh: rcar: core: rename shadowing variables
  ASoC: sh: rcar: ctu: add  missing error check
  ASoC: sh: rcar: ssi: remove redundant assignment
  ASoC: sh: siu_pcm: remove useless assignment
  ASoC: sh: siu_pcm: remove unused variable

 sound/soc/sh/dma-sh7760.c |  1 -
 sound/soc/sh/rcar/core.c  | 14 +++++++-------
 sound/soc/sh/rcar/ctu.c   |  2 ++
 sound/soc/sh/rcar/rsnd.h  |  6 +++---
 sound/soc/sh/rcar/ssi.c   |  1 -
 sound/soc/sh/siu_pcm.c    |  6 +-----
 6 files changed, 13 insertions(+), 17 deletions(-)

--
2.25.1
parents d5974807 b7e41867

sound/soc/sh/dma-sh7760.c

+0 −1
Original line number Diff line number Diff line
@@ -177,7 +177,6 @@ static int camelot_hw_params(struct snd_soc_component *component, 
	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	struct camelot_pcm *cam = &cam_pcm_data[asoc_rtd_to_cpu(rtd, 0)->id];

	int recv = substream->stream == SNDRV_PCM_STREAM_PLAYBACK ? 0:1;

	int ret;



	if (recv) {

		cam->rx_period_size = params_period_bytes(hw_params);

sound/soc/sh/rcar/core.c

+1 −1
Original line number Diff line number Diff line
@@ -216,7 +216,7 @@ int rsnd_mod_init(struct rsnd_priv *priv, 
	mod->clk	= clk;

	mod->priv	= priv;



	return ret;

	return 0;

}



void rsnd_mod_quit(struct rsnd_mod *mod)

sound/soc/sh/rcar/ctu.c

+2 −0
Original line number Diff line number Diff line
@@ -207,6 +207,8 @@ static int rsnd_ctu_pcm_new(struct rsnd_mod *mod, 
			       NULL,

			       &ctu->pass, RSND_MAX_CHANNELS,

			       0xC);

	if (ret < 0)

		return ret;



	/* ROW0 */

	ret = rsnd_kctrl_new_m(mod, io, rtd, "CTU SV0",

sound/soc/sh/rcar/rsnd.h

+3 −3
Original line number Diff line number Diff line
@@ -597,15 +597,15 @@ phys_addr_t rsnd_gen_get_phy_addr(struct rsnd_priv *priv, int reg_id); 
 *	R-Car ADG

 */

int rsnd_adg_clk_query(struct rsnd_priv *priv, unsigned int rate);

int rsnd_adg_ssi_clk_stop(struct rsnd_mod *mod);

int rsnd_adg_ssi_clk_try_start(struct rsnd_mod *mod, unsigned int rate);

int rsnd_adg_ssi_clk_stop(struct rsnd_mod *ssi_mod);

int rsnd_adg_ssi_clk_try_start(struct rsnd_mod *ssi_mod, unsigned int rate);

int rsnd_adg_probe(struct rsnd_priv *priv);

void rsnd_adg_remove(struct rsnd_priv *priv);

int rsnd_adg_set_src_timesel_gen2(struct rsnd_mod *src_mod,

				  struct rsnd_dai_stream *io,

				  unsigned int in_rate,

				  unsigned int out_rate);

int rsnd_adg_set_cmd_timsel_gen2(struct rsnd_mod *mod,

int rsnd_adg_set_cmd_timsel_gen2(struct rsnd_mod *cmd_mod,

				 struct rsnd_dai_stream *io);

#define rsnd_adg_clk_enable(priv)	rsnd_adg_clk_control(priv, 1)

#define rsnd_adg_clk_disable(priv)	rsnd_adg_clk_control(priv, 0)

sound/soc/sh/rcar/ssi.c

+0 −1
Original line number Diff line number Diff line
@@ -400,7 +400,6 @@ static void rsnd_ssi_config_init(struct rsnd_mod *mod, 
	 * see

	 *	rsnd_ssiu_init_gen2()

	 */

	wsr = ssi->wsr;

	if (is_tdm || is_tdm_split) {

		wsr	|= WS_MODE;

		cr_own	|= CHNL_8;