mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-02 00:24:12 +08:00
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.
This commit is contained in:
commit
447d63a2cd
@ -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:
|
||||
*
|
||||
|
@ -1189,7 +1189,7 @@ correct_plug_type:
|
||||
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) {
|
||||
|
@ -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) &
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user