Skip to contentSkip to conversation

spi: sh_spi: Use sh_spi_clear_bit() instead of open-coded

PATCH New Axel Lin 3 participants 3 messages Dec 27, 2013 – Jan 6, 2014 SPI

lore
Share & tools
lore

Axel Lin

author
#0 lore raw

PATCH 1/1 spi: sh_spi: Use sh_spi_clear_bit() instead of open-coded

We have a sh_spi_clear_bit() function, there's no reason not to use it.

---
 drivers/spi/sh_spi.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)
drivers/spi/sh_spi.c +2 -8
index 744afe3..7ca5e36 100644
@@ -151,7 +151,6 @@ static int sh_spi_send(struct sh_spi *ss, const unsigned char *tx_data,
 {
 	int i, cur_len, ret = 0;
 	int remain = (int)len;
-	unsigned long tmp;
 
 	if (len >= SH_SPI_FIFO_SIZE)
 		sh_spi_set_bit(SH_SPI_SSA, &ss->regs->cr1);
@@ -183,9 +182,7 @@ static int sh_spi_send(struct sh_spi *ss, const unsigned char *tx_data,
 	}
 
 	if (flags & SPI_XFER_END) {
-		tmp = sh_spi_read(&ss->regs->cr1);
-		tmp = tmp & ~(SH_SPI_SSD | SH_SPI_SSDB);
-		sh_spi_write(tmp, &ss->regs->cr1);
+		sh_spi_clear_bit(SH_SPI_SSD | SH_SPI_SSDB, &ss->regs->cr1);
 		sh_spi_set_bit(SH_SPI_SSA, &ss->regs->cr1);
 		udelay(100);
 		write_fifo_empty_wait(ss);
@@ -198,16 +195,13 @@ static int sh_spi_receive(struct sh_spi *ss, unsigned char *rx_data,
 			  unsigned int len, unsigned long flags)
 {
 	int i;
-	unsigned long tmp;
 
 	if (len > SH_SPI_MAX_BYTE)
 		sh_spi_write(SH_SPI_MAX_BYTE, &ss->regs->cr3);
 	else
 		sh_spi_write(len, &ss->regs->cr3);
 
-	tmp = sh_spi_read(&ss->regs->cr1);
-	tmp = tmp & ~(SH_SPI_SSD | SH_SPI_SSDB);
-	sh_spi_write(tmp, &ss->regs->cr1);
+	sh_spi_clear_bit(SH_SPI_SSD | SH_SPI_SSDB, &ss->regs->cr1);
 	sh_spi_set_bit(SH_SPI_SSA, &ss->regs->cr1);
 
 	for (i = 0; i < len; i++) {
Signature · 1 line
1.8.1.2
#2 lore raw

PATCH 1/1 spi: sh_spi: Use sh_spi_clear_bit() instead of open-coded

Quoted 14 lines · Nobuhiro Iwamatsu

Hi,

Thanks for your patch.

2013/12/27 Axel Lin <[email protected]>:

Quoted 3 lines

We have a sh_spi_clear_bit() function, there's no reason not to use it.

Best regards,
Nobuhiro

Quoted 8 lines

--
Nobuhiro Iwamatsu
iwamatsu at {nigauri.org / debian.org}
GPG ID: 40AD1FA6
_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Applied to u-boot-spi/master

Signature · 2 lines
Thanks,
Jagan.