Unverified Commit 447d63a2 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: codecs: minor cppcheck cleanups 

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

Small number of cleanups that were either missed in previous versions
or detected by new cppcheck version.
parents ce963f84 7a0431bb

sound/soc/codecs/hdmi-codec.c

+0 −4
Original line number Diff line number Diff line
@@ -20,10 +20,6 @@ 


#define HDMI_CODEC_CHMAP_IDX_UNKNOWN  -1



struct hdmi_codec_channel_map_table {

	unsigned char map;	/* ALSA API channel map position */

};



/*

 * CEA speaker placement for HDMI 1.4:

 *

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

+1 −1
Original line number Diff line number Diff line
@@ -1189,7 +1189,7 @@ static void wcd_correct_swch_plug(struct work_struct *work) 
				pt_gnd_mic_swap_cnt = 0;

				plug_type = wcd_mbhc_get_plug_from_adc(mbhc, output_mv);

				continue;

			} else if (cross_conn < 0) /* Error */

			} else /* Error if (cross_conn < 0) */

				continue;



			if (pt_gnd_mic_swap_cnt == GND_MIC_SWAP_THRESHOLD) {

sound/soc/codecs/wcd9335.c

+1 −3
Original line number Diff line number Diff line
@@ -1821,12 +1821,10 @@ static int wcd9335_set_decimator_rate(struct snd_soc_dai *dai, 
			tx_port_reg = WCD9335_CDC_IF_ROUTER_TX_MUX_CFG3;

			shift = 0;

			shift_val = 0x0F;

		} else if (tx_port == 13) {

		} else /* (tx_port == 13) */ {

			tx_port_reg = WCD9335_CDC_IF_ROUTER_TX_MUX_CFG3;

			shift = 4;

			shift_val = 0x03;

		} else {

			return -EINVAL;

		}



		tx_mux_sel = snd_soc_component_read(comp, tx_port_reg) &

sound/soc/fsl/fsl_utils.c

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ void fsl_asoc_reparent_pll_clocks(struct device *dev, struct clk *clk, 
{

	struct clk *p, *pll = NULL, *npll = NULL;

	bool reparent = false;

	int ret = 0;

	int ret;



	if (!clk || !pll8k_clk || !pll11k_clk)

		return;

sound/soc/ti/omap-mcbsp.c

+1 −1
Original line number Diff line number Diff line
@@ -614,7 +614,7 @@ static int omap_mcbsp_init(struct platform_device *pdev) 
{

	struct omap_mcbsp *mcbsp = platform_get_drvdata(pdev);

	struct resource *res;

	int ret = 0;

	int ret;



	spin_lock_init(&mcbsp->lock);

	mcbsp->free = true;