]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
spi: sn-f-ospi: Use FIELD_MODIFY()
authorHans Zhang <18255117159@163.com>
Thu, 30 Apr 2026 15:54:52 +0000 (23:54 +0800)
committerMark Brown <broonie@kernel.org>
Mon, 11 May 2026 12:05:08 +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-7-18255117159@163.com
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi-sn-f-ospi.c

index b459d51cb3a87e5c3172594fdb4294cd5934bea5..f0320e96fe232ad6246ed5c42929ab8b44627a3e 100644 (file)
@@ -222,9 +222,8 @@ static void f_ospi_config_clk(struct f_ospi *ospi, u32 device_hz)
         */
        val = readl(ospi->base + OSPI_CLK_CTL);
 
-       val &= ~(OSPI_CLK_CTL_PHA | OSPI_CLK_CTL_DIV);
-       val |= FIELD_PREP(OSPI_CLK_CTL_PHA, OSPI_CLK_CTL_PHA_180)
-            | FIELD_PREP(OSPI_CLK_CTL_DIV, div_reg);
+       FIELD_MODIFY(OSPI_CLK_CTL_PHA, &val, OSPI_CLK_CTL_PHA_180);
+       FIELD_MODIFY(OSPI_CLK_CTL_DIV, &val, div_reg);
 
        writel(val, ospi->base + OSPI_CLK_CTL);
 }