Merge series "ASoC: cppcheck fixes of the week" from Pierre-Louis Bossart <pierre...

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

diff --git a/sound/soc/codecs/mt6359-accdet.c b/sound/soc/codecs/mt6359-accdet.c
index 4222aed013f1060a1ce07f957152f44b8ea4293c..78314187d37efd67541dd1d9536a83b305dfc65e 100644 (file)
--- 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 b909b36582b74a7d73e3137300859b41187f2e27..2d6a4a29b850704df430906491b497254c66048a 100644 (file)
--- 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 2687ae60fd363961c2052d7d919e1cf3dabe2003..8c0b00242bb872c93e8958481adcf8a9f6426345 100644 (file)
--- 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);

diff --git a/sound/soc/fsl/imx-pcm-rpmsg.c b/sound/soc/fsl/imx-pcm-rpmsg.c
index 3f5913adbfb0da68ef63535a475873e233e54a7d..6d6c44cf3451f9dfa8847b7c35039febfa317781 100644 (file)
--- a/sound/soc/fsl/imx-pcm-rpmsg.c
+++ b/sound/soc/fsl/imx-pcm-rpmsg.c
@@ -544,7 +544,7 @@ static int imx_rpmsg_pcm_ack(struct snd_soc_component *component,
        struct rpmsg_msg *msg;
        unsigned long flags;
        int buffer_tail = 0;
-       int written_num = 0;
+       int written_num;
 
        if (!rpmsg->force_lpa)
                return 0;