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

index 7ee4c92e6e09a54aefa6216ecf5344e610ce37e6..77a2c11bec5ed7d2a87d39da81c862b1be8816d3 100644 (file)
@@ -206,10 +206,9 @@ static int amlogic_spifc_a1_read(struct amlogic_spifc_a1 *spifc, void *buf,
        u32 val = readl(spifc->base + SPIFC_A1_USER_CTRL3_REG);
        int ret;
 
-       val &= ~(SPIFC_A1_USER_DIN_MODE | SPIFC_A1_USER_DIN_BYTES);
        val |= SPIFC_A1_USER_DIN_ENABLE;
-       val |= FIELD_PREP(SPIFC_A1_USER_DIN_MODE, mode);
-       val |= FIELD_PREP(SPIFC_A1_USER_DIN_BYTES, size);
+       FIELD_MODIFY(SPIFC_A1_USER_DIN_MODE, &val, mode);
+       FIELD_MODIFY(SPIFC_A1_USER_DIN_BYTES, &val, size);
        writel(val, spifc->base + SPIFC_A1_USER_CTRL3_REG);
 
        ret = amlogic_spifc_a1_request(spifc, true);