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

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

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

Lots of small fixes in various codec drivers that should have no
functional impact.

Pierre-Louis Bossart (23):
  ASoC: ab8500-codec: remove useless structure
  ASoC: ad1836: remove useless return
  ASoC: adau1977: remove useless return
  ASoC: cros_ec_codec: remove null pointer dereference warning
  ASoC: cx2070x: remove useless assignment
  ASoC: cx2070x: remove duplicate else branch
  ASoC: da7219-aad: remove useless initialization
  ASoC: hdac_hdmi: remove useless initializations
  ASoC: hdac_hdmi: align function arguments
  ASoC: hdmi-codec: remove useless initialization
  ASoC: hdmi-codec: remove unused spk_mask member
  ASoC: max98090: remove useless assignment
  ASoC: mt6358: remove useless initializations
  ASoC: mt6359: remove useless assignment
  ASoC: nau8825: remove useless assignment
  ASoC: pcm1681: remove useless assignment
  ASoC: sigmadsp: align function prototype
  ASoC: sti-sas: remove unused struct members
  ASoC: tas2562: remove useless assignment
  ASoC: tas2562: remove warning on return value
  ASoC: tas2770: remove useless initialization
  ASoC: tlv320dac33: clarify expression
  ASoC: tscs454: remove useless test on PLL disable

 sound/soc/codecs/ab8500-codec.c  |  7 -------
 sound/soc/codecs/ad1836.c        |  2 --
 sound/soc/codecs/adau1977.c      |  2 --
 sound/soc/codecs/cros_ec_codec.c |  2 +-
 sound/soc/codecs/cx2072x.c       | 11 ++++-------
 sound/soc/codecs/da7219-aad.c    |  2 +-
 sound/soc/codecs/hdac_hdmi.c     | 14 +++++++-------
 sound/soc/codecs/hdac_hdmi.h     |  2 +-
 sound/soc/codecs/hdmi-codec.c    |  3 +--
 sound/soc/codecs/max98090.c      |  2 +-
 sound/soc/codecs/mt6358.c        |  4 ++--
 sound/soc/codecs/mt6359.c        |  4 ++--
 sound/soc/codecs/nau8825.c       |  2 +-
 sound/soc/codecs/pcm1681.c       |  2 +-
 sound/soc/codecs/sigmadsp.h      |  2 +-
 sound/soc/codecs/sti-sas.c       |  3 ---
 sound/soc/codecs/tas2562.c       |  3 +--
 sound/soc/codecs/tas2770.c       |  2 +-
 sound/soc/codecs/tlv320dac33.c   |  2 +-
 sound/soc/codecs/tscs454.c       |  7 ++++++-
 20 files changed, 32 insertions(+), 46 deletions(-)

--
2.25.1
parents cdd23ae6 a2cc1568

sound/soc/codecs/ab8500-codec.c

+0 −7
Original line number Diff line number Diff line
@@ -113,13 +113,6 @@ enum amic_idx { 
	AMIC_IDX_2

};



struct ab8500_codec_drvdata_dbg {

	struct regulator *vaud;

	struct regulator *vamic1;

	struct regulator *vamic2;

	struct regulator *vdmic;

};



/* Private data for AB8500 device-driver */

struct ab8500_codec_drvdata {

	struct regmap *regmap;

sound/soc/codecs/ad1836.c

+0 −2
Original line number Diff line number Diff line
@@ -305,8 +305,6 @@ static int ad1836_probe(struct snd_soc_component *component) 
		return ret;



	ret = snd_soc_dapm_add_routes(dapm, ad183x_adc_routes, num_adcs);

	if (ret)

		return ret;



	return ret;

}

sound/soc/codecs/adau1977.c

+0 −2
Original line number Diff line number Diff line
@@ -236,8 +236,6 @@ static int adau1977_reset(struct adau1977 *adau1977) 
	ret = regmap_write(adau1977->regmap, ADAU1977_REG_POWER,

			ADAU1977_POWER_RESET);

	regcache_cache_bypass(adau1977->regmap, false);

	if (ret)

		return ret;



	return ret;

}

sound/soc/codecs/cros_ec_codec.c

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ static int send_ec_host_command(struct cros_ec_device *ec_dev, uint32_t cmd, 
	if (ret < 0)

		goto error;



	if (insize)

	if (in && insize)

		memcpy(in, msg->data, insize);



	ret = 0;

sound/soc/codecs/cx2072x.c

+4 −7
Original line number Diff line number Diff line
@@ -827,9 +827,6 @@ static int cx2072x_config_i2spcm(struct cx2072x_priv *cx2072x) 
	}

	regdbt2.r.i2s_bclk_invert = is_bclk_inv;



	reg1.r.rx_data_one_line = 1;

	reg1.r.tx_data_one_line = 1;



	/* Configures the BCLK output */

	bclk_rate = cx2072x->sample_rate * frame_len;

	reg5.r.i2s_pcm_clk_div_chan_en = 0;
@@ -1433,11 +1430,11 @@ static int cx2072x_jack_status_check(void *data) 
			state |= SND_JACK_HEADSET;

			if (type & 0x2)

				state |= SND_JACK_BTN_0;

		} else if (type & 0x4) {

			/* Nokia headset */

			state |= SND_JACK_HEADPHONE;

		} else {

			/* Headphone */

			/*

			 * Nokia headset (type & 0x4) and

			 * regular Headphone

			 */

			state |= SND_JACK_HEADPHONE;

		}

	}