From f3325baae2a7aeaa3e9869488df7e546356e8212 Mon Sep 17 00:00:00 2001 From: Gilberto Gambugge Date: Fri, 14 Aug 2020 11:34:30 -0300 Subject: [PATCH] tas2562: fix build failure Fixing the misleading indentation build failure +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Build error: motorola/kernel/modules/sound/soc/codecs/tas2562-regmap.c:658:3: error: misleading indentation; statement is not part of the previous 'else' [-Werror,-Wmisleading-indentation] +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ NO_PROP_NEEDED: Change-Id: Ifde783bd51eba163fe96e181b5a9dca62c0d0ff4 Reviewed-on: https://gerrit.mot.com/1722676 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Ling Jin Submit-Approved: Jira Key --- sound/soc/codecs/tas2562-regmap.c | 90 +++++++++++++++---------------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/sound/soc/codecs/tas2562-regmap.c b/sound/soc/codecs/tas2562-regmap.c index fac5a2a32061..cc51a4b580c8 100644 --- a/sound/soc/codecs/tas2562-regmap.c +++ b/sound/soc/codecs/tas2562-regmap.c @@ -602,58 +602,58 @@ static void irq_work_routine(struct work_struct *work) */ if ((nDevInt1Status & - TAS2562_LATCHEDINTERRUPTREG0_TDMCLOCKERRORSTICKY_INTERRUPT) || - (nDevInt3Status & - TAS2562_LATCHEDINTERRUPTREG0_TDMCLOCKERRORSTICKY_INTERRUPT)) { + TAS2562_LATCHEDINTERRUPTREG0_TDMCLOCKERRORSTICKY_INTERRUPT) || + (nDevInt3Status & + TAS2562_LATCHEDINTERRUPTREG0_TDMCLOCKERRORSTICKY_INTERRUPT)) { p_tas2562->mn_err_code |= ERROR_CLOCK; dev_err(p_tas2562->dev, "TDM clock error!\n"); - } else - p_tas2562->mn_err_code &= ~ERROR_OVER_CURRENT; + } else + p_tas2562->mn_err_code &= ~ERROR_OVER_CURRENT; - if ((nDevInt1Status & - TAS2562_LATCHEDINTERRUPTREG0_OCEFLAGSTICKY_INTERRUPT) || - (nDevInt3Status & - TAS2562_LATCHEDINTERRUPTREG0_OCEFLAGSTICKY_INTERRUPT)) { - p_tas2562->mn_err_code |= ERROR_OVER_CURRENT; - dev_err(p_tas2562->dev, "SPK over current!\n"); - } else - p_tas2562->mn_err_code &= ~ERROR_OVER_CURRENT; + if ((nDevInt1Status & + TAS2562_LATCHEDINTERRUPTREG0_OCEFLAGSTICKY_INTERRUPT) || + (nDevInt3Status & + TAS2562_LATCHEDINTERRUPTREG0_OCEFLAGSTICKY_INTERRUPT)) { + p_tas2562->mn_err_code |= ERROR_OVER_CURRENT; + dev_err(p_tas2562->dev, "SPK over current!\n"); + } else + p_tas2562->mn_err_code &= ~ERROR_OVER_CURRENT; - if ((nDevInt1Status & - TAS2562_LATCHEDINTERRUPTREG0_OTEFLAGSTICKY_INTERRUPT) || - (nDevInt3Status & - TAS2562_LATCHEDINTERRUPTREG0_OTEFLAGSTICKY_INTERRUPT)) { - p_tas2562->mn_err_code |= ERROR_DIE_OVERTEMP; - dev_err(p_tas2562->dev, "die over temperature!\n"); - } else - p_tas2562->mn_err_code &= ~ERROR_DIE_OVERTEMP; + if ((nDevInt1Status & + TAS2562_LATCHEDINTERRUPTREG0_OTEFLAGSTICKY_INTERRUPT) || + (nDevInt3Status & + TAS2562_LATCHEDINTERRUPTREG0_OTEFLAGSTICKY_INTERRUPT)) { + p_tas2562->mn_err_code |= ERROR_DIE_OVERTEMP; + dev_err(p_tas2562->dev, "die over temperature!\n"); + } else + p_tas2562->mn_err_code &= ~ERROR_DIE_OVERTEMP; - if ((nDevInt2Status & - TAS2562_LATCHEDINTERRUPTREG1_VBATOVLOSTICKY_INTERRUPT) || - (nDevInt4Status & - TAS2562_LATCHEDINTERRUPTREG1_VBATOVLOSTICKY_INTERRUPT)) { - p_tas2562->mn_err_code |= ERROR_OVER_VOLTAGE; - dev_err(p_tas2562->dev, "SPK over voltage!\n"); - } else - p_tas2562->mn_err_code &= ~ERROR_UNDER_VOLTAGE; + if ((nDevInt2Status & + TAS2562_LATCHEDINTERRUPTREG1_VBATOVLOSTICKY_INTERRUPT) || + (nDevInt4Status & + TAS2562_LATCHEDINTERRUPTREG1_VBATOVLOSTICKY_INTERRUPT)) { + p_tas2562->mn_err_code |= ERROR_OVER_VOLTAGE; + dev_err(p_tas2562->dev, "SPK over voltage!\n"); + } else + p_tas2562->mn_err_code &= ~ERROR_UNDER_VOLTAGE; - if ((nDevInt2Status & - TAS2562_LATCHEDINTERRUPTREG1_VBATUVLOSTICKY_INTERRUPT) || - (nDevInt4Status & - TAS2562_LATCHEDINTERRUPTREG1_VBATUVLOSTICKY_INTERRUPT)) { - p_tas2562->mn_err_code |= ERROR_UNDER_VOLTAGE; - dev_err(p_tas2562->dev, "SPK under voltage!\n"); - } else - p_tas2562->mn_err_code &= ~ERROR_UNDER_VOLTAGE; + if ((nDevInt2Status & + TAS2562_LATCHEDINTERRUPTREG1_VBATUVLOSTICKY_INTERRUPT) || + (nDevInt4Status & + TAS2562_LATCHEDINTERRUPTREG1_VBATUVLOSTICKY_INTERRUPT)) { + p_tas2562->mn_err_code |= ERROR_UNDER_VOLTAGE; + dev_err(p_tas2562->dev, "SPK under voltage!\n"); + } else + p_tas2562->mn_err_code &= ~ERROR_UNDER_VOLTAGE; - if ((nDevInt2Status & - TAS2562_LATCHEDINTERRUPTREG1_BROWNOUTFLAGSTICKY_INTERRUPT) || - (nDevInt4Status & - TAS2562_LATCHEDINTERRUPTREG1_BROWNOUTFLAGSTICKY_INTERRUPT)) { - p_tas2562->mn_err_code |= ERROR_BROWNOUT; - dev_err(p_tas2562->dev, "brownout!\n"); - } else - p_tas2562->mn_err_code &= ~ERROR_BROWNOUT; + if ((nDevInt2Status & + TAS2562_LATCHEDINTERRUPTREG1_BROWNOUTFLAGSTICKY_INTERRUPT) || + (nDevInt4Status & + TAS2562_LATCHEDINTERRUPTREG1_BROWNOUTFLAGSTICKY_INTERRUPT)) { + p_tas2562->mn_err_code |= ERROR_BROWNOUT; + dev_err(p_tas2562->dev, "brownout!\n"); + } else + p_tas2562->mn_err_code &= ~ERROR_BROWNOUT; goto reload; } else {