[PATCH] ASoC: ux500: avoid -Wparentheses warning
From: Arnd Bergmann
Date: Tue Sep 15 2026 - 16:21:36 EST
From: Arnd Bergmann <arnd@xxxxxxxx>
gcc warns about a slightly confusing expression in two lines
of this driver:
In file included from sound/soc/ux500/ux500_msp_i2s.c:20:
sound/soc/ux500/ux500_msp_i2s.c: In function 'configure_protocol':
sound/soc/ux500/ux500_msp_i2s.h:151:38: error: suggest parentheses around arithmetic in operand of '^' [-Werror=parentheses]
151 | #define MSP_TX_CLKPOL_BIT(n) ((n & TCKPOL_MASK) << TCKPOL_SHIFT)
sound/soc/ux500/ux500_msp_i2s.c:204:21: note: in expansion of macro 'MSP_TX_CLKPOL_BIT'
204 | temp_reg |= MSP_TX_CLKPOL_BIT(!protdesc->tx_clk_pol ^
| ^~~~~~~~~~~~~~~~~
config->bclk_inverted is a boolean variable, while protdesc->tx_clk_pol
is a 32-bit unsigned integer that can only be zero or one in order to
be passed into MSP_RX_CLKPOL_BIT().
Move the negation out of the inner expression to make this easier
to understand by the compiler.
Fixes: 9ccbacf5a012 ("ASoC: ux500: Validate MSP DAI configuration")
Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
---
I still find the new version equally confusing, if anyone has a
better idea to make this more readable, let's do that instead.
---
sound/soc/ux500/ux500_msp_i2s.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/sound/soc/ux500/ux500_msp_i2s.c b/sound/soc/ux500/ux500_msp_i2s.c
index 683b485fb570..588d381230b6 100644
--- a/sound/soc/ux500/ux500_msp_i2s.c
+++ b/sound/soc/ux500/ux500_msp_i2s.c
@@ -201,12 +201,12 @@ static int configure_protocol(struct ux500_msp *msp,
/* The code below should not be separated. */
temp_reg = readl(msp->registers + MSP_GCR) & ~TX_CLK_POL_RISING;
- temp_reg |= MSP_TX_CLKPOL_BIT(!protdesc->tx_clk_pol ^
- config->bclk_inverted);
+ temp_reg |= MSP_TX_CLKPOL_BIT(!(protdesc->tx_clk_pol ^
+ config->bclk_inverted));
writel(temp_reg, msp->registers + MSP_GCR);
temp_reg = readl(msp->registers + MSP_GCR) & ~RX_CLK_POL_RISING;
- temp_reg |= MSP_RX_CLKPOL_BIT(protdesc->rx_clk_pol ^
- config->bclk_inverted);
+ temp_reg |= MSP_RX_CLKPOL_BIT(!!(protdesc->rx_clk_pol ^
+ config->bclk_inverted));
writel(temp_reg, msp->registers + MSP_GCR);
return 0;
--
2.53.0