diff options
| author | Mark Brown <broonie@kernel.org> | 2021-05-11 09:06:00 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-05-11 09:06:00 +0100 |
| commit | 3b8fb1f7702be9dcc50443b5822cb409a31280a3 (patch) | |
| tree | bb250d9f3d8981c3d3bc3c0b5ca269aa4d5482da /sound/soc/codecs | |
| parent | b748ad38041a9a7ab2ab1cb9f8ad24271d1de9c4 (diff) | |
| parent | cccc16dc175eafa2dec98002dde35d19ace0a696 (diff) | |
| download | linux-next-3b8fb1f7702be9dcc50443b5822cb409a31280a3.tar.gz | |
Merge series "ASoC: cppcheck fixes of the week" from Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>:
While running some checks on a rebased branch, I realized I missed a
couple of trivial cases on newer code.
Pierre-Louis Bossart (4):
ASoC: codecs: mt6359-accdet: remove useless initialization
ASoc: codecs: mt6359: remove useless initializations
ASoC: codecs: rt1019: clarify expression
ASoC: fsl: imx-pcm-rpmsg: remove useless initialization
sound/soc/codecs/mt6359-accdet.c | 2 +-
sound/soc/codecs/mt6359.c | 2 +-
sound/soc/codecs/rt1019.c | 4 ++--
sound/soc/fsl/imx-pcm-rpmsg.c | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
--
2.25.1
Diffstat (limited to 'sound/soc/codecs')
| -rw-r--r-- | sound/soc/codecs/mt6359-accdet.c | 2 | ||||
| -rw-r--r-- | sound/soc/codecs/mt6359.c | 2 | ||||
| -rw-r--r-- | sound/soc/codecs/rt1019.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/codecs/mt6359-accdet.c b/sound/soc/codecs/mt6359-accdet.c index 4222aed013f1..78314187d37e 100644 --- a/sound/soc/codecs/mt6359-accdet.c +++ b/sound/soc/codecs/mt6359-accdet.c @@ -414,7 +414,7 @@ static void mt6359_accdet_work(struct work_struct *work) static void mt6359_accdet_jd_work(struct work_struct *work) { - int ret = 0; + int ret; unsigned int value = 0; struct mt6359_accdet *priv = diff --git a/sound/soc/codecs/mt6359.c b/sound/soc/codecs/mt6359.c index b909b36582b7..2d6a4a29b850 100644 --- a/sound/soc/codecs/mt6359.c +++ b/sound/soc/codecs/mt6359.c @@ -271,7 +271,7 @@ static void hp_aux_feedback_loop_gain_ramp(struct mt6359_priv *priv, bool up) static void hp_in_pair_current(struct mt6359_priv *priv, bool increase) { - int i = 0, stage = 0; + int i, stage; int target = 0x3; /* Set input diff pair bias select (Hi-Fi mode) */ diff --git a/sound/soc/codecs/rt1019.c b/sound/soc/codecs/rt1019.c index 2687ae60fd36..8c0b00242bb8 100644 --- a/sound/soc/codecs/rt1019.c +++ b/sound/soc/codecs/rt1019.c @@ -372,8 +372,8 @@ static int rt1019_set_dai_pll(struct snd_soc_dai *dai, int pll_id, int source, RT1019_AUTO_BITS_SEL_MANU | RT1019_AUTO_CLK_SEL_MANU); snd_soc_component_update_bits(component, RT1019_PLL_1, RT1019_PLL_M_MASK | RT1019_PLL_M_BP_MASK | RT1019_PLL_Q_8_8_MASK, - (pll_code.m_bp ? 0 : pll_code.m_code) << RT1019_PLL_M_SFT | - pll_code.m_bp << RT1019_PLL_M_BP_SFT | + ((pll_code.m_bp ? 0 : pll_code.m_code) << RT1019_PLL_M_SFT) | + (pll_code.m_bp << RT1019_PLL_M_BP_SFT) | ((pll_code.n_code >> 8) & RT1019_PLL_Q_8_8_MASK)); snd_soc_component_update_bits(component, RT1019_PLL_2, RT1019_PLL_Q_7_0_MASK, pll_code.n_code & RT1019_PLL_Q_7_0_MASK); |