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

Merge series "ASoC: realtek: fix cppcheck warnings" from Pierre-Louis Bossart... 

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

Lots of trivial issues that make cppcheck too verbose. There shouldn't
be any functionality change with this patchset.

Pierre-Louis Bossart (24):
  ASoC: rt1011: use logical OR
  ASoC: rt1011: remove redundant test
  ASoC: rt1011: clarify expression
  ASoC: rt1015: clarify expression
  ASoC: rt1016: clarify expression
  ASoC: rt1305: clarify expression
  ASoC: rt1308: clarify expression
  ASoC: rt5640: clarify expression
  ASoC: rt5645: use logical OR
  ASoC: rt5645: clarify expression
  ASoC: rt5651: clarify expression
  ASoC: rt5651: remove useless assignment
  ASoC: rt5659: clarify expression
  ASoC: rt5660: clarify expression
  ASoC: rt5663: clarify expression
  ASoC: rt5665: clarify expression
  ASoC: rt5668: clarify expression
  ASoC: rt5668: remove useless assignments
  ASoC: rt5670: clarify expression
  ASoC: rt5677: clarify expression
  ASoC: rt5677: remove useless assignment
  ASoC: rt5682: clarify expression
  ASoC: rt5682: remove useless assignments
  ASoC: rt5682: remove useless initialization

 sound/soc/codecs/rt1011.c | 47 ++++++++++++++++++---------------------
 sound/soc/codecs/rt1015.c |  5 +++--
 sound/soc/codecs/rt1016.c |  7 +++---
 sound/soc/codecs/rt1305.c |  4 ++--
 sound/soc/codecs/rt1308.c |  8 +++----
 sound/soc/codecs/rt5640.c |  6 ++---
 sound/soc/codecs/rt5645.c |  6 ++---
 sound/soc/codecs/rt5651.c |  6 ++---
 sound/soc/codecs/rt5659.c |  4 ++--
 sound/soc/codecs/rt5660.c |  4 ++--
 sound/soc/codecs/rt5663.c |  4 ++--
 sound/soc/codecs/rt5665.c |  4 ++--
 sound/soc/codecs/rt5668.c |  8 +++----
 sound/soc/codecs/rt5670.c |  4 ++--
 sound/soc/codecs/rt5677.c |  6 ++---
 sound/soc/codecs/rt5682.c | 12 +++++-----
 16 files changed, 67 insertions(+), 68 deletions(-)

--
2.25.1
parents 51bc908f f1a1da09

sound/soc/codecs/rt1011.c

+22 −25
Original line number Diff line number Diff line
@@ -1089,25 +1089,21 @@ static int rt1011_recv_spk_mode_put(struct snd_kcontrol *kcontrol, 


static bool rt1011_validate_bq_drc_coeff(unsigned short reg)

{

	if ((reg == RT1011_DAC_SET_1) |

		(reg >= RT1011_ADC_SET && reg <= RT1011_ADC_SET_1) |

		(reg == RT1011_ADC_SET_4) | (reg == RT1011_ADC_SET_5) |

		(reg == RT1011_MIXER_1) |

		(reg == RT1011_A_TIMING_1) | (reg >= RT1011_POWER_7 &&

		reg <= RT1011_POWER_8) |

		(reg == RT1011_CLASS_D_POS) | (reg == RT1011_ANALOG_CTRL) |

		(reg >= RT1011_SPK_TEMP_PROTECT_0 &&

		reg <= RT1011_SPK_TEMP_PROTECT_6) |

		(reg >= RT1011_SPK_PRO_DC_DET_5 && reg <= RT1011_BAT_GAIN_1) |

		(reg >= RT1011_RT_DRC_CROSS && reg <= RT1011_RT_DRC_POS_8) |

		(reg >= RT1011_CROSS_BQ_SET_1 && reg <= RT1011_BQ_10_A2_15_0) |

		(reg >= RT1011_SMART_BOOST_TIMING_1 &&

		reg <= RT1011_SMART_BOOST_TIMING_36) |

		(reg == RT1011_SINE_GEN_REG_1) |

		(reg >= RT1011_STP_ALPHA_RECIPROCAL_MSB &&

		reg <= RT1011_BQ_6_PARAMS_CHECK_5) |

		(reg >= RT1011_BQ_7_PARAMS_CHECK_1 &&

		reg <= RT1011_BQ_10_PARAMS_CHECK_5))

	if ((reg == RT1011_DAC_SET_1) ||

		(reg >= RT1011_ADC_SET && reg <= RT1011_ADC_SET_1) ||

		(reg == RT1011_ADC_SET_4) || (reg == RT1011_ADC_SET_5) ||

		(reg == RT1011_MIXER_1) ||

		(reg == RT1011_A_TIMING_1) ||

		(reg >= RT1011_POWER_7 && reg <= RT1011_POWER_8) ||

		(reg == RT1011_CLASS_D_POS) || (reg == RT1011_ANALOG_CTRL) ||

		(reg >= RT1011_SPK_TEMP_PROTECT_0 && reg <= RT1011_SPK_TEMP_PROTECT_6) ||

		(reg >= RT1011_SPK_PRO_DC_DET_5 && reg <= RT1011_BAT_GAIN_1) ||

		(reg >= RT1011_RT_DRC_CROSS && reg <= RT1011_RT_DRC_POS_8) ||

		(reg >= RT1011_CROSS_BQ_SET_1 && reg <= RT1011_BQ_10_A2_15_0) ||

		(reg >= RT1011_SMART_BOOST_TIMING_1 && reg <= RT1011_SMART_BOOST_TIMING_36) ||

		(reg == RT1011_SINE_GEN_REG_1) ||

		(reg >= RT1011_STP_ALPHA_RECIPROCAL_MSB && reg <= RT1011_BQ_6_PARAMS_CHECK_5) ||

		(reg >= RT1011_BQ_7_PARAMS_CHECK_1 && reg <= RT1011_BQ_10_PARAMS_CHECK_5))

		return true;



	return false;
@@ -1782,8 +1778,9 @@ static int rt1011_set_component_pll(struct snd_soc_component *component, 
		pll_code.n_code, pll_code.k_code);



	snd_soc_component_write(component, RT1011_PLL_1,

		(pll_code.m_bp ? 0 : pll_code.m_code) << RT1011_PLL1_QM_SFT |

		pll_code.m_bp << RT1011_PLL1_BPM_SFT | pll_code.n_code);

		((pll_code.m_bp ? 0 : pll_code.m_code) << RT1011_PLL1_QM_SFT) |

		(pll_code.m_bp << RT1011_PLL1_BPM_SFT) |

		pll_code.n_code);

	snd_soc_component_write(component, RT1011_PLL_2,

		pll_code.k_code);
@@ -1991,7 +1988,7 @@ static int rt1011_set_tdm_slot(struct snd_soc_dai *dai, 
		RT1011_TDM_I2S_DOCK_EN_1_MASK, tdm_en);

	snd_soc_component_update_bits(component, RT1011_TDM2_SET_2,

		RT1011_TDM_I2S_DOCK_EN_2_MASK, tdm_en);

	if (tx_slotnum)



	snd_soc_component_update_bits(component, RT1011_TDM_TOTAL_SET,

		RT1011_ADCDAT1_PIN_CONFIG | RT1011_ADCDAT2_PIN_CONFIG,

		RT1011_ADCDAT1_OUTPUT | RT1011_ADCDAT2_OUTPUT);

sound/soc/codecs/rt1015.c

+3 −2
Original line number Diff line number Diff line
@@ -893,8 +893,9 @@ static int rt1015_set_component_pll(struct snd_soc_component *component, 
		pll_code.n_code, pll_code.k_code);



	snd_soc_component_write(component, RT1015_PLL1,

		(pll_code.m_bp ? 0 : pll_code.m_code) << RT1015_PLL_M_SFT |

		pll_code.m_bp << RT1015_PLL_M_BP_SFT | pll_code.n_code);

		((pll_code.m_bp ? 0 : pll_code.m_code) << RT1015_PLL_M_SFT) |

		(pll_code.m_bp << RT1015_PLL_M_BP_SFT) |

		pll_code.n_code);

	snd_soc_component_write(component, RT1015_PLL2,

		pll_code.k_code);

sound/soc/codecs/rt1016.c

+4 −3
Original line number Diff line number Diff line
@@ -500,10 +500,11 @@ static int rt1016_set_component_pll(struct snd_soc_component *component, 
		(pll_code.k_bp ? 0 : pll_code.k_code));



	snd_soc_component_write(component, RT1016_PLL1,

		(pll_code.m_bp ? 0 : pll_code.m_code) << RT1016_PLL_M_SFT |

		pll_code.m_bp << RT1016_PLL_M_BP_SFT | pll_code.n_code);

		((pll_code.m_bp ? 0 : pll_code.m_code) << RT1016_PLL_M_SFT) |

		(pll_code.m_bp << RT1016_PLL_M_BP_SFT) |

		pll_code.n_code);

	snd_soc_component_write(component, RT1016_PLL2,

		pll_code.k_bp << RT1016_PLL_K_BP_SFT |

		(pll_code.k_bp << RT1016_PLL_K_BP_SFT) |

		(pll_code.k_bp ? 0 : pll_code.k_code));



	rt1016->pll_in = freq_in;

sound/soc/codecs/rt1305.c

+2 −2
Original line number Diff line number Diff line
@@ -850,8 +850,8 @@ static int rt1305_set_component_pll(struct snd_soc_component *component, 
		pll_code.n_code, pll_code.k_code);



	snd_soc_component_write(component, RT1305_PLL1_1,

		(pll_code.m_bp ? 0 : pll_code.m_code) << RT1305_PLL_1_M_SFT |

		pll_code.m_bp << RT1305_PLL_1_M_BYPASS_SFT |

		((pll_code.m_bp ? 0 : pll_code.m_code) << RT1305_PLL_1_M_SFT) |

		(pll_code.m_bp << RT1305_PLL_1_M_BYPASS_SFT) |

		pll_code.n_code);

	snd_soc_component_write(component, RT1305_PLL1_2,

		pll_code.k_code);

sound/soc/codecs/rt1308.c

+4 −4
Original line number Diff line number Diff line
@@ -673,10 +673,10 @@ static int rt1308_set_component_pll(struct snd_soc_component *component, 
		pll_code.n_code, pll_code.k_code);



	snd_soc_component_write(component, RT1308_PLL_1,

		pll_code.k_code << RT1308_PLL1_K_SFT |

		pll_code.m_bp << RT1308_PLL1_M_BYPASS_SFT |

		(pll_code.m_bp ? 0 : pll_code.m_code) << RT1308_PLL1_M_SFT |

		pll_code.n_code << RT1308_PLL1_N_SFT);

		(pll_code.k_code << RT1308_PLL1_K_SFT) |

		(pll_code.m_bp << RT1308_PLL1_M_BYPASS_SFT) |

		((pll_code.m_bp ? 0 : pll_code.m_code) << RT1308_PLL1_M_SFT) |

		(pll_code.n_code << RT1308_PLL1_N_SFT));



	rt1308->pll_in = freq_in;

	rt1308->pll_out = freq_out;