Unverified Commit 893bc891 authored by Mark Brown's avatar Mark Brown
Browse files

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

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

Second batch of cleanups for Qualcomm SOCs and codecs. The only
functional change is the addition of a missing error check in the last
patch.

Pierre-Louis Bossart (10):
  ASoC: qcom: lpass-hdmi: remove useless return
  ASoC: qcom: lpass-platform: remove useless assignment
  ASoC: qcom: q6dsp-dai: clarify expression
  ASoC: qcom: q6afe: remove useless assignments
  ASoC: qcom: q6afe: align function prototype
  ASoC: qcom: q6asm: align function prototypes
  ASoC: wcd-clsh-v2: align function prototypes
  ASoC: wcd9335: clarify return value
  ASoC: wcd934x: remove useless return
  ASoC: lpass-wsa-macro: add missing test

 sound/soc/codecs/lpass-wsa-macro.c | 2 ++
 sound/soc/codecs/wcd-clsh-v2.h     | 6 +++---
 sound/soc/codecs/wcd9335.c         | 2 +-
 sound/soc/codecs/wcd934x.c         | 2 --
 sound/soc/qcom/lpass-hdmi.c        | 4 ----
 sound/soc/qcom/lpass-platform.c    | 2 +-
 sound/soc/qcom/qdsp6/q6afe-dai.c   | 2 +-
 sound/soc/qcom/qdsp6/q6afe.c       | 5 ++---
 sound/soc/qcom/qdsp6/q6afe.h       | 2 +-
 sound/soc/qcom/qdsp6/q6asm.h       | 6 +++---
 10 files changed, 14 insertions(+), 19 deletions(-)

--
2.25.1
parents 2b719fd2 4b4f2119

sound/soc/codecs/lpass-wsa-macro.c

+2 −0
Original line number Diff line number Diff line
@@ -944,6 +944,8 @@ static int wsa_macro_set_interpolator_rate(struct snd_soc_dai *dai, 
		goto prim_rate;



	ret = wsa_macro_set_mix_interpolator_rate(dai, (u8) rate_val, sample_rate);

	if (ret < 0)

		return ret;

prim_rate:

	/* set primary path sample rate */

	for (i = 0; i < ARRAY_SIZE(int_prim_sample_rate_val); i++) {

sound/soc/codecs/wcd-clsh-v2.h

+3 −3
Original line number Diff line number Diff line
@@ -37,13 +37,13 @@ enum wcd_clsh_mode { 
struct wcd_clsh_ctrl;



extern struct wcd_clsh_ctrl *wcd_clsh_ctrl_alloc(

				struct snd_soc_component *component,

				struct snd_soc_component *comp,

				int version);

extern void wcd_clsh_ctrl_free(struct wcd_clsh_ctrl *ctrl);

extern int wcd_clsh_ctrl_get_state(struct wcd_clsh_ctrl *ctrl);

extern int wcd_clsh_ctrl_set_state(struct wcd_clsh_ctrl *ctrl,

				   enum wcd_clsh_event event,

				   int state,

				   enum wcd_clsh_event clsh_event,

				   int nstate,

				   enum wcd_clsh_mode mode);



#endif /* _WCD_CLSH_V2_H_ */

sound/soc/codecs/wcd9335.c

+1 −1
Original line number Diff line number Diff line
@@ -5213,7 +5213,7 @@ static int wcd9335_slim_status(struct slim_device *sdev, 


	wcd9335_probe(wcd);



	return ret;

	return 0;

}



static const struct slim_device_id wcd9335_slim_id[] = {

sound/soc/codecs/wcd934x.c

+0 −2
Original line number Diff line number Diff line
@@ -1565,8 +1565,6 @@ static int wcd934x_set_interpolator_rate(struct snd_soc_dai *dai, 
		return ret;

	ret = wcd934x_set_mix_interpolator_rate(dai, (u8)rate_val,

						sample_rate);

	if (ret)

		return ret;



	return ret;

}

sound/soc/qcom/lpass-hdmi.c

+0 −4
Original line number Diff line number Diff line
@@ -183,8 +183,6 @@ static int lpass_hdmi_daiops_hw_params(struct snd_pcm_substream *substream, 
		return ret;



	ret = regmap_field_write(sstream_ctl->dp_staffing_en, LPASS_SSTREAM_DEFAULT_ENABLE);

	if (ret)

		return ret;



	return ret;

}
@@ -200,8 +198,6 @@ static int lpass_hdmi_daiops_prepare(struct snd_pcm_substream *substream, 
		return ret;



	ret = regmap_field_write(drvdata->meta_ctl->mute, LPASS_MUTE_DISABLE);

	if (ret)

		return ret;



	return ret;

}