Commit 3b8fb1f7 authored by Mark Brown's avatar Mark Brown

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

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
parents b748ad38 cccc16dc
...@@ -414,7 +414,7 @@ static void mt6359_accdet_work(struct work_struct *work) ...@@ -414,7 +414,7 @@ static void mt6359_accdet_work(struct work_struct *work)
static void mt6359_accdet_jd_work(struct work_struct *work) static void mt6359_accdet_jd_work(struct work_struct *work)
{ {
int ret = 0; int ret;
unsigned int value = 0; unsigned int value = 0;
struct mt6359_accdet *priv = struct mt6359_accdet *priv =
......
...@@ -271,7 +271,7 @@ static void hp_aux_feedback_loop_gain_ramp(struct mt6359_priv *priv, bool up) ...@@ -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) static void hp_in_pair_current(struct mt6359_priv *priv, bool increase)
{ {
int i = 0, stage = 0; int i, stage;
int target = 0x3; int target = 0x3;
/* Set input diff pair bias select (Hi-Fi mode) */ /* Set input diff pair bias select (Hi-Fi mode) */
......
...@@ -372,8 +372,8 @@ static int rt1019_set_dai_pll(struct snd_soc_dai *dai, int pll_id, int source, ...@@ -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); RT1019_AUTO_BITS_SEL_MANU | RT1019_AUTO_CLK_SEL_MANU);
snd_soc_component_update_bits(component, RT1019_PLL_1, snd_soc_component_update_bits(component, RT1019_PLL_1,
RT1019_PLL_M_MASK | RT1019_PLL_M_BP_MASK | RT1019_PLL_Q_8_8_MASK, 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 ? 0 : pll_code.m_code) << RT1019_PLL_M_SFT) |
pll_code.m_bp << RT1019_PLL_M_BP_SFT | (pll_code.m_bp << RT1019_PLL_M_BP_SFT) |
((pll_code.n_code >> 8) & RT1019_PLL_Q_8_8_MASK)); ((pll_code.n_code >> 8) & RT1019_PLL_Q_8_8_MASK));
snd_soc_component_update_bits(component, RT1019_PLL_2, 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); RT1019_PLL_Q_7_0_MASK, pll_code.n_code & RT1019_PLL_Q_7_0_MASK);
......
...@@ -544,7 +544,7 @@ static int imx_rpmsg_pcm_ack(struct snd_soc_component *component, ...@@ -544,7 +544,7 @@ static int imx_rpmsg_pcm_ack(struct snd_soc_component *component,
struct rpmsg_msg *msg; struct rpmsg_msg *msg;
unsigned long flags; unsigned long flags;
int buffer_tail = 0; int buffer_tail = 0;
int written_num = 0; int written_num;
if (!rpmsg->force_lpa) if (!rpmsg->force_lpa)
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment