]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
spi: cadence-xspi: Use FIELD_MODIFY()
authorHans Zhang <18255117159@163.com>
Thu, 30 Apr 2026 15:54:49 +0000 (23:54 +0800)
committerMark Brown <broonie@kernel.org>
Mon, 11 May 2026 12:05:06 +0000 (21:05 +0900)
Use FIELD_MODIFY() to remove open-coded bit manipulation.
No functional change intended.

Signed-off-by: Hans Zhang <18255117159@163.com>
Link: https://patch.msgid.link/20260430155456.36998-4-18255117159@163.com
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi-cadence-xspi.c

index 895b4b3276a56d7b4b436d63cf849e2160f35183..32fa19ebf7a99e67b79c939b995d70dfcbdb674f 100644 (file)
@@ -453,8 +453,7 @@ static bool cdns_mrvl_xspi_setup_clock(struct cdns_xspi_dev *cdns_xspi,
                writel(clk_reg,
                       cdns_xspi->auxbase + MRVL_XSPI_CLK_CTRL_AUX_REG);
                clk_reg = FIELD_PREP(MRVL_XSPI_CLK_DIV, i);
-               clk_reg &= ~MRVL_XSPI_CLK_DIV;
-               clk_reg |= FIELD_PREP(MRVL_XSPI_CLK_DIV, i);
+               FIELD_MODIFY(MRVL_XSPI_CLK_DIV, &clk_reg, i);
                clk_reg |= MRVL_XSPI_CLK_ENABLE;
                clk_reg |= MRVL_XSPI_IRQ_ENABLE;
                update_clk = true;