]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
spi: cadence-quadspi: Use BIT() macros where possible
authorVignesh Raghavendra <vigneshr@ti.com>
Fri, 5 Sep 2025 18:59:58 +0000 (00:29 +0530)
committerMark Brown <broonie@kernel.org>
Tue, 9 Sep 2025 13:17:35 +0000 (14:17 +0100)
Convert few open coded bit shifts to BIT() macro for better readability.
No functional changes intended.

Signed-off-by: Vignesh Raghavendra <vigneshr@ti.com>
Signed-off-by: Santhosh Kumar K <s-k6@ti.com>
Message-ID: <20250905185958.3575037-5-s-k6@ti.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi-cadence-quadspi.c

index 6627a3059ea35985afbe02c63253d2c8cc3e398c..af253b86f1ab2636f47936e38c7347b6e141ae19 100644 (file)
@@ -335,7 +335,7 @@ static bool cqspi_is_idle(struct cqspi_st *cqspi)
 {
        u32 reg = readl(cqspi->iobase + CQSPI_REG_CONFIG);
 
-       return reg & (1UL << CQSPI_REG_CONFIG_IDLE_LSB);
+       return reg & BIT(CQSPI_REG_CONFIG_IDLE_LSB);
 }
 
 static u32 cqspi_get_rd_sram_level(struct cqspi_st *cqspi)
@@ -571,7 +571,7 @@ static int cqspi_command_read(struct cqspi_flash_pdata *f_pdata,
                reg |= (dummy_clk & CQSPI_REG_CMDCTRL_DUMMY_MASK)
                     << CQSPI_REG_CMDCTRL_DUMMY_LSB;
 
-       reg |= (0x1 << CQSPI_REG_CMDCTRL_RD_EN_LSB);
+       reg |= BIT(CQSPI_REG_CMDCTRL_RD_EN_LSB);
 
        /* 0 means 1 byte. */
        reg |= (((n_rx - 1) & CQSPI_REG_CMDCTRL_RD_BYTES_MASK)
@@ -579,7 +579,7 @@ static int cqspi_command_read(struct cqspi_flash_pdata *f_pdata,
 
        /* setup ADDR BIT field */
        if (op->addr.nbytes) {
-               reg |= (0x1 << CQSPI_REG_CMDCTRL_ADDR_EN_LSB);
+               reg |= BIT(CQSPI_REG_CMDCTRL_ADDR_EN_LSB);
                reg |= ((op->addr.nbytes - 1) &
                        CQSPI_REG_CMDCTRL_ADD_BYTES_MASK)
                        << CQSPI_REG_CMDCTRL_ADD_BYTES_LSB;
@@ -646,7 +646,7 @@ static int cqspi_command_write(struct cqspi_flash_pdata *f_pdata,
        reg = opcode << CQSPI_REG_CMDCTRL_OPCODE_LSB;
 
        if (op->addr.nbytes) {
-               reg |= (0x1 << CQSPI_REG_CMDCTRL_ADDR_EN_LSB);
+               reg |= BIT(CQSPI_REG_CMDCTRL_ADDR_EN_LSB);
                reg |= ((op->addr.nbytes - 1) &
                        CQSPI_REG_CMDCTRL_ADD_BYTES_MASK)
                        << CQSPI_REG_CMDCTRL_ADD_BYTES_LSB;
@@ -655,7 +655,7 @@ static int cqspi_command_write(struct cqspi_flash_pdata *f_pdata,
        }
 
        if (n_tx) {
-               reg |= (0x1 << CQSPI_REG_CMDCTRL_WR_EN_LSB);
+               reg |= BIT(CQSPI_REG_CMDCTRL_WR_EN_LSB);
                reg |= ((n_tx - 1) & CQSPI_REG_CMDCTRL_WR_BYTES_MASK)
                        << CQSPI_REG_CMDCTRL_WR_BYTES_LSB;
                data = 0;
@@ -1191,7 +1191,7 @@ static void cqspi_chipselect(struct cqspi_flash_pdata *f_pdata)
                 * CS2 to 4b'1011
                 * CS3 to 4b'0111
                 */
-               chip_select = 0xF & ~(1 << chip_select);
+               chip_select = 0xF & ~BIT(chip_select);
        }
 
        reg &= ~(CQSPI_REG_CONFIG_CHIPSELECT_MASK
@@ -1277,9 +1277,9 @@ static void cqspi_readdata_capture(struct cqspi_st *cqspi,
        reg = readl(reg_base + CQSPI_REG_READCAPTURE);
 
        if (bypass)
-               reg |= (1 << CQSPI_REG_READCAPTURE_BYPASS_LSB);
+               reg |= BIT(CQSPI_REG_READCAPTURE_BYPASS_LSB);
        else
-               reg &= ~(1 << CQSPI_REG_READCAPTURE_BYPASS_LSB);
+               reg &= ~BIT(CQSPI_REG_READCAPTURE_BYPASS_LSB);
 
        reg &= ~(CQSPI_REG_READCAPTURE_DELAY_MASK
                 << CQSPI_REG_READCAPTURE_DELAY_LSB);