Skip to content

Commit d9e33b3

Browse files
r-vigneshbroonie
authored andcommitted
spi: cadence-quadspi: Use BIT() macros where possible
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>
1 parent 858d4d9 commit d9e33b3

1 file changed

Lines changed: 8 additions & 8 deletions

File tree

drivers/spi/spi-cadence-quadspi.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ static bool cqspi_is_idle(struct cqspi_st *cqspi)
335335
{
336336
u32 reg = readl(cqspi->iobase + CQSPI_REG_CONFIG);
337337

338-
return reg & (1UL << CQSPI_REG_CONFIG_IDLE_LSB);
338+
return reg & BIT(CQSPI_REG_CONFIG_IDLE_LSB);
339339
}
340340

341341
static u32 cqspi_get_rd_sram_level(struct cqspi_st *cqspi)
@@ -571,15 +571,15 @@ static int cqspi_command_read(struct cqspi_flash_pdata *f_pdata,
571571
reg |= (dummy_clk & CQSPI_REG_CMDCTRL_DUMMY_MASK)
572572
<< CQSPI_REG_CMDCTRL_DUMMY_LSB;
573573

574-
reg |= (0x1 << CQSPI_REG_CMDCTRL_RD_EN_LSB);
574+
reg |= BIT(CQSPI_REG_CMDCTRL_RD_EN_LSB);
575575

576576
/* 0 means 1 byte. */
577577
reg |= (((n_rx - 1) & CQSPI_REG_CMDCTRL_RD_BYTES_MASK)
578578
<< CQSPI_REG_CMDCTRL_RD_BYTES_LSB);
579579

580580
/* setup ADDR BIT field */
581581
if (op->addr.nbytes) {
582-
reg |= (0x1 << CQSPI_REG_CMDCTRL_ADDR_EN_LSB);
582+
reg |= BIT(CQSPI_REG_CMDCTRL_ADDR_EN_LSB);
583583
reg |= ((op->addr.nbytes - 1) &
584584
CQSPI_REG_CMDCTRL_ADD_BYTES_MASK)
585585
<< CQSPI_REG_CMDCTRL_ADD_BYTES_LSB;
@@ -646,7 +646,7 @@ static int cqspi_command_write(struct cqspi_flash_pdata *f_pdata,
646646
reg = opcode << CQSPI_REG_CMDCTRL_OPCODE_LSB;
647647

648648
if (op->addr.nbytes) {
649-
reg |= (0x1 << CQSPI_REG_CMDCTRL_ADDR_EN_LSB);
649+
reg |= BIT(CQSPI_REG_CMDCTRL_ADDR_EN_LSB);
650650
reg |= ((op->addr.nbytes - 1) &
651651
CQSPI_REG_CMDCTRL_ADD_BYTES_MASK)
652652
<< CQSPI_REG_CMDCTRL_ADD_BYTES_LSB;
@@ -655,7 +655,7 @@ static int cqspi_command_write(struct cqspi_flash_pdata *f_pdata,
655655
}
656656

657657
if (n_tx) {
658-
reg |= (0x1 << CQSPI_REG_CMDCTRL_WR_EN_LSB);
658+
reg |= BIT(CQSPI_REG_CMDCTRL_WR_EN_LSB);
659659
reg |= ((n_tx - 1) & CQSPI_REG_CMDCTRL_WR_BYTES_MASK)
660660
<< CQSPI_REG_CMDCTRL_WR_BYTES_LSB;
661661
data = 0;
@@ -1191,7 +1191,7 @@ static void cqspi_chipselect(struct cqspi_flash_pdata *f_pdata)
11911191
* CS2 to 4b'1011
11921192
* CS3 to 4b'0111
11931193
*/
1194-
chip_select = 0xF & ~(1 << chip_select);
1194+
chip_select = 0xF & ~BIT(chip_select);
11951195
}
11961196

11971197
reg &= ~(CQSPI_REG_CONFIG_CHIPSELECT_MASK
@@ -1277,9 +1277,9 @@ static void cqspi_readdata_capture(struct cqspi_st *cqspi,
12771277
reg = readl(reg_base + CQSPI_REG_READCAPTURE);
12781278

12791279
if (bypass)
1280-
reg |= (1 << CQSPI_REG_READCAPTURE_BYPASS_LSB);
1280+
reg |= BIT(CQSPI_REG_READCAPTURE_BYPASS_LSB);
12811281
else
1282-
reg &= ~(1 << CQSPI_REG_READCAPTURE_BYPASS_LSB);
1282+
reg &= ~BIT(CQSPI_REG_READCAPTURE_BYPASS_LSB);
12831283

12841284
reg &= ~(CQSPI_REG_READCAPTURE_DELAY_MASK
12851285
<< CQSPI_REG_READCAPTURE_DELAY_LSB);

0 commit comments

Comments
 (0)