Unverified Commit 5ca8f9a5 authored by Mark Brown's avatar Mark Brown
Browse files

Merge series "ASoC: Intel: fix cppcheck warnings" from Pierre-Louis Bossart... 

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
parents ba3e069f 8f0ccd59

sound/soc/intel/atom/sst-atom-controls.c

+2 −2
Original line number Diff line number Diff line
@@ -299,7 +299,7 @@ static int sst_find_and_send_pipe_algo(struct sst_data *drv, 
{

	int ret = 0;

	struct sst_algo_control *bc;

	struct sst_module *algo = NULL;

	struct sst_module *algo;



	dev_dbg(&drv->pdev->dev, "Enter: widget=%s\n", pipe);
@@ -602,7 +602,7 @@ static int sst_set_pipe_gain(struct sst_ids *ids, 
	int ret = 0;

	struct sst_gain_mixer_control *mc;

	struct sst_gain_value *gv;

	struct sst_module *gain = NULL;

	struct sst_module *gain;



	list_for_each_entry(gain, &ids->gain_list, node) {

		struct snd_kcontrol *kctl = gain->kctl;

sound/soc/intel/atom/sst-mfld-platform-compress.c

+1 −2
Original line number Diff line number Diff line
@@ -42,8 +42,7 @@ static void sst_drain_notify(void *arg) 
static int sst_platform_compr_open(struct snd_soc_component *component,

				   struct snd_compr_stream *cstream)

{



	int ret_val = 0;

	int ret_val;

	struct snd_compr_runtime *runtime = cstream->runtime;

	struct sst_runtime_stream *stream;

sound/soc/intel/atom/sst-mfld-platform-pcm.c

+2 −2
Original line number Diff line number Diff line
@@ -366,7 +366,7 @@ static int sst_media_prepare(struct snd_pcm_substream *substream, 
		struct snd_soc_dai *dai)

{

	struct sst_runtime_stream *stream;

	int ret_val = 0, str_id;

	int ret_val, str_id;



	stream = substream->runtime->private_data;

	str_id = stream->stream_info.str_id;
@@ -385,7 +385,7 @@ static int sst_media_prepare(struct snd_pcm_substream *substream, 
	if (ret_val)

		return ret_val;

	substream->runtime->hw.info = SNDRV_PCM_INFO_BLOCK_TRANSFER;

	return ret_val;

	return 0;

}



static int sst_enable_ssp(struct snd_pcm_substream *substream,

sound/soc/intel/atom/sst-mfld-platform.h

+2 −2
Original line number Diff line number Diff line
@@ -173,6 +173,6 @@ struct sst_data { 
	struct snd_soc_card *soc_card;

	struct sst_cmd_sba_hw_set_ssp ssp_cmd;

};

int sst_register_dsp(struct sst_device *sst);

int sst_unregister_dsp(struct sst_device *sst);

int sst_register_dsp(struct sst_device *dev);

int sst_unregister_dsp(struct sst_device *dev);

#endif

sound/soc/intel/atom/sst/sst.c

+2 −3
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ static irqreturn_t intel_sst_interrupt_mrfld(int irq, void *context) 
	union ipc_header_mrfld header;

	union sst_imr_reg_mrfld imr;

	struct ipc_post *msg = NULL;

	unsigned int size = 0;

	unsigned int size;

	struct intel_sst_drv *drv = (struct intel_sst_drv *) context;

	irqreturn_t retval = IRQ_HANDLED;
@@ -370,7 +370,6 @@ void sst_context_cleanup(struct intel_sst_drv *ctx) 
	kfree(ctx->fw_in_mem);

	ctx->fw_in_mem = NULL;

	sst_memcpy_free_resources(ctx);

	ctx = NULL;

}

EXPORT_SYMBOL_GPL(sst_context_cleanup);
@@ -424,7 +423,7 @@ static int intel_sst_suspend(struct device *dev) 
{

	struct intel_sst_drv *ctx = dev_get_drvdata(dev);

	struct sst_fw_save *fw_save;

	int i, ret = 0;

	int i, ret;



	/* check first if we are already in SW reset */

	if (ctx->sst_state == SST_RESET)