Unverified Commit 88406aa6 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: trivial changes for cppcheck warnings 

Merge series from Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>:

This can probably wait for the next merge window, I found a number of
cppcheck warnings that I didn't see in my last checks. The irony is
that the only really important issue found by cppcheck was on one of
my previous DPCM changes (submitted separately as a fix).
parents ed05d691 7188b28f

sound/soc/codecs/cs35l45.h

+1 −1
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ struct cs35l45_private { 
extern const struct dev_pm_ops cs35l45_pm_ops;

extern const struct regmap_config cs35l45_i2c_regmap;

extern const struct regmap_config cs35l45_spi_regmap;

int cs35l45_apply_patch(struct cs35l45_private *cs43l45);

int cs35l45_apply_patch(struct cs35l45_private *cs35l45);

unsigned int cs35l45_get_clk_freq_id(unsigned int freq);

int cs35l45_probe(struct cs35l45_private *cs35l45);

void cs35l45_remove(struct cs35l45_private *cs35l45);

sound/soc/codecs/cs42l42.c

+1 −2
Original line number Diff line number Diff line
@@ -1701,7 +1701,6 @@ static irqreturn_t cs42l42_irq_thread(int irq, void *data) 
			break;



		default:

			if (cs42l42->plug_state != CS42L42_TS_TRANS)

			cs42l42->plug_state = CS42L42_TS_TRANS;

		}

	}

sound/soc/codecs/wcd-mbhc-v2.c

+1 −1
Original line number Diff line number Diff line
@@ -1306,7 +1306,7 @@ static irqreturn_t wcd_mbhc_adc_hs_rem_irq(int irq, void *data) 
static irqreturn_t wcd_mbhc_adc_hs_ins_irq(int irq, void *data)

{

	struct wcd_mbhc *mbhc = data;

	u8 clamp_state = 0;

	u8 clamp_state;

	u8 clamp_retry = WCD_MBHC_FAKE_INS_RETRY;



	/*

sound/soc/codecs/wcd9335.c

+2 −2
Original line number Diff line number Diff line
@@ -1807,11 +1807,11 @@ static int wcd9335_set_decimator_rate(struct snd_soc_dai *dai, 
			tx_port_reg = WCD9335_CDC_IF_ROUTER_TX_MUX_CFG0;

			shift = (tx_port << 1);

			shift_val = 0x03;

		} else if ((tx_port >= 4) && (tx_port < 8)) {

		} else if (tx_port < 8) {

			tx_port_reg = WCD9335_CDC_IF_ROUTER_TX_MUX_CFG1;

			shift = ((tx_port - 4) << 1);

			shift_val = 0x03;

		} else if ((tx_port >= 8) && (tx_port < 11)) {

		} else if (tx_port < 11) {

			tx_port_reg = WCD9335_CDC_IF_ROUTER_TX_MUX_CFG2;

			shift = ((tx_port - 8) << 1);

			shift_val = 0x03;

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

+2 −2
Original line number Diff line number Diff line
@@ -1328,7 +1328,7 @@ int sst_send_pipe_gains(struct snd_soc_dai *dai, int stream, int mute) 
{

	struct sst_data *drv = snd_soc_dai_get_drvdata(dai);

	struct snd_soc_dapm_widget *w;

	struct snd_soc_dapm_path *p = NULL;

	struct snd_soc_dapm_path *p;



	dev_dbg(dai->dev, "enter, dai-name=%s dir=%d\n", dai->name, stream);
@@ -1392,7 +1392,7 @@ int sst_send_pipe_gains(struct snd_soc_dai *dai, int stream, int mute) 
static int sst_fill_module_list(struct snd_kcontrol *kctl,

	 struct snd_soc_dapm_widget *w, int type)

{

	struct sst_module *module = NULL;

	struct sst_module *module;

	struct snd_soc_component *c = snd_soc_dapm_to_component(w->dapm);

	struct sst_ids *ids = w->priv;

	int ret = 0;