Unverified Commit d5974807 authored by Mark Brown's avatar Mark Brown
Browse files

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

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

This is the first batch of cleanups to make cppcheck more usable,
currently we have way too many warnings that drown real issues.

Pierre-Louis Bossart (6):
  ASoC: soc-ops: remove useless assignment
  ASoC: soc-pcm: remove redundant assignment
  ASoC: soc-pcm: remove shadowing variable
  ASoC: soc-pcm: add error log
  ASoC: soc-topology: clarify expression
  ASoC: generic: simple-card-utils: remove useless assignment

 sound/soc/generic/simple-card-utils.c |  2 +-
 sound/soc/soc-ops.c                   |  2 +-
 sound/soc/soc-pcm.c                   |  4 ++--
 sound/soc/soc-topology.c              | 16 ++++++++--------
 4 files changed, 12 insertions(+), 12 deletions(-)

--
2.25.1
parents 260fe553 bd029fc8

sound/soc/generic/simple-card-utils.c

+1 −1
Original line number Diff line number Diff line
@@ -254,7 +254,7 @@ int asoc_simple_hw_params(struct snd_pcm_substream *substream, 
	struct simple_dai_props *dai_props =

		simple_priv_to_props(priv, rtd->num);

	unsigned int mclk, mclk_fs = 0;

	int ret = 0;

	int ret;



	if (dai_props->mclk_fs)

		mclk_fs = dai_props->mclk_fs;

sound/soc/soc-ops.c

+1 −1
Original line number Diff line number Diff line
@@ -407,7 +407,7 @@ int snd_soc_put_volsw_sx(struct snd_kcontrol *kcontrol, 
	int min = mc->min;

	unsigned int mask = (1U << (fls(min + max) - 1)) - 1;

	int err = 0;

	unsigned int val, val_mask, val2 = 0;

	unsigned int val, val_mask, val2;



	val_mask = mask << shift;

	val = (ucontrol->value.integer.value[0] + min) & mask;

sound/soc/soc-pcm.c

+2 −2
Original line number Diff line number Diff line
@@ -1707,7 +1707,6 @@ static int dpcm_apply_symmetry(struct snd_pcm_substream *fe_substream, 
			snd_soc_dpcm_get_substream(be, stream);

		struct snd_soc_pcm_runtime *rtd;

		struct snd_soc_dai *dai;

		int i;



		/* A backend may not have the requested substream */

		if (!be_substream)
@@ -1901,6 +1900,8 @@ static int dpcm_fe_dai_hw_free(struct snd_pcm_substream *substream) 
	/* only hw_params backends that are either sinks or sources

	 * to this frontend DAI */

	err = dpcm_be_dai_hw_free(fe, stream);

	if (err < 0)

		dev_err(fe->dev, "ASoC: hw_free BE failed %d\n", err);



	fe->dpcm[stream].state = SND_SOC_DPCM_STATE_HW_FREE;

	dpcm_set_fe_update_state(fe, stream, SND_SOC_DPCM_UPDATE_NO);
@@ -2388,7 +2389,6 @@ static int dpcm_run_update_startup(struct snd_soc_pcm_runtime *fe, int stream) 
	/* Only start the BE if the FE is ready */

	if (fe->dpcm[stream].state == SND_SOC_DPCM_STATE_HW_FREE ||

		fe->dpcm[stream].state == SND_SOC_DPCM_STATE_CLOSE) {

		ret = -EINVAL;

		dev_err(fe->dev, "ASoC: FE %s is not ready %d\n",

			fe->dai_link->name, fe->dpcm[stream].state);

		ret = -EINVAL;

sound/soc/soc-topology.c

+8 −8
Original line number Diff line number Diff line
@@ -1673,16 +1673,16 @@ static void set_dai_flags(struct snd_soc_dai_driver *dai_drv, 
{

	if (flag_mask & SND_SOC_TPLG_DAI_FLGBIT_SYMMETRIC_RATES)

		dai_drv->symmetric_rate =

			flags & SND_SOC_TPLG_DAI_FLGBIT_SYMMETRIC_RATES ? 1 : 0;

			(flags & SND_SOC_TPLG_DAI_FLGBIT_SYMMETRIC_RATES) ? 1 : 0;



	if (flag_mask & SND_SOC_TPLG_DAI_FLGBIT_SYMMETRIC_CHANNELS)

		dai_drv->symmetric_channels =

			flags & SND_SOC_TPLG_DAI_FLGBIT_SYMMETRIC_CHANNELS ?

			(flags & SND_SOC_TPLG_DAI_FLGBIT_SYMMETRIC_CHANNELS) ?

			1 : 0;



	if (flag_mask & SND_SOC_TPLG_DAI_FLGBIT_SYMMETRIC_SAMPLEBITS)

		dai_drv->symmetric_sample_bits =

			flags & SND_SOC_TPLG_DAI_FLGBIT_SYMMETRIC_SAMPLEBITS ?

			(flags & SND_SOC_TPLG_DAI_FLGBIT_SYMMETRIC_SAMPLEBITS) ?

			1 : 0;

}
@@ -1765,21 +1765,21 @@ static void set_link_flags(struct snd_soc_dai_link *link, 
{

	if (flag_mask & SND_SOC_TPLG_LNK_FLGBIT_SYMMETRIC_RATES)

		link->symmetric_rate =

			flags & SND_SOC_TPLG_LNK_FLGBIT_SYMMETRIC_RATES ? 1 : 0;

			(flags & SND_SOC_TPLG_LNK_FLGBIT_SYMMETRIC_RATES) ? 1 : 0;



	if (flag_mask & SND_SOC_TPLG_LNK_FLGBIT_SYMMETRIC_CHANNELS)

		link->symmetric_channels =

			flags & SND_SOC_TPLG_LNK_FLGBIT_SYMMETRIC_CHANNELS ?

			(flags & SND_SOC_TPLG_LNK_FLGBIT_SYMMETRIC_CHANNELS) ?

			1 : 0;



	if (flag_mask & SND_SOC_TPLG_LNK_FLGBIT_SYMMETRIC_SAMPLEBITS)

		link->symmetric_sample_bits =

			flags & SND_SOC_TPLG_LNK_FLGBIT_SYMMETRIC_SAMPLEBITS ?

			(flags & SND_SOC_TPLG_LNK_FLGBIT_SYMMETRIC_SAMPLEBITS) ?

			1 : 0;



	if (flag_mask & SND_SOC_TPLG_LNK_FLGBIT_VOICE_WAKEUP)

		link->ignore_suspend =

		flags & SND_SOC_TPLG_LNK_FLGBIT_VOICE_WAKEUP ?

			(flags & SND_SOC_TPLG_LNK_FLGBIT_VOICE_WAKEUP) ?

			1 : 0;

}