[U-Boot] [PATCH 1/2] sf: eeprom_m95xxx: fix up style

[U-Boot] [PATCH 1/2] sf: eeprom_m95xxx: fix up style

[Mike Frysinger]

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
 drivers/mtd/spi/eeprom_m95xxx.c |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/drivers/mtd/spi/eeprom_m95xxx.c b/drivers/mtd/spi/eeprom_m95xxx.c
index ef8ed6f..bae9445 100644
--- a/drivers/mtd/spi/eeprom_m95xxx.c
+++ b/drivers/mtd/spi/eeprom_m95xxx.c
@@ -37,33 +37,33 @@
 #define CONFIG_DEFAULT_SPI_MODE SPI_MODE_0
 #endif
 
-ssize_t spi_read (uchar *addr, int alen, uchar *buffer, int len)
+ssize_t spi_read(uchar *addr, int alen, uchar *buffer, int len)
 {
 	struct spi_slave *slave;
 	u8 cmd = SPI_EEPROM_READ;
 
 	slave = spi_setup_slave(CONFIG_DEFAULT_SPI_BUS, 1, 1000000,
 			CONFIG_DEFAULT_SPI_MODE);
-	if(!slave)
+	if (!slave)
 		return 0;
 
 	spi_claim_bus(slave);
 
 	/* command */
-	if(spi_xfer(slave, 8, &cmd, NULL, SPI_XFER_BEGIN))
+	if (spi_xfer(slave, 8, &cmd, NULL, SPI_XFER_BEGIN))
 		return -1;
 
 	/*
-	 * if alen == 3, addr[0] is the block number, we never use it here. All we
-	 * need are the lower 16 bits
+	 * if alen == 3, addr[0] is the block number, we never use it here.
+	 * All we need are the lower 16 bits.
 	 */
 	if (alen == 3)
 		addr++;
 
 	/* address, and data */
-	if(spi_xfer(slave, 16, addr, NULL, 0))
+	if (spi_xfer(slave, 16, addr, NULL, 0))
 		return -1;
-	if(spi_xfer(slave, 8 * len, NULL, buffer, SPI_XFER_END))
+	if (spi_xfer(slave, 8 * len, NULL, buffer, SPI_XFER_END))
 		return -1;
 
 	spi_release_bus(slave);
@@ -71,7 +71,7 @@ ssize_t spi_read (uchar *addr, int alen, uchar *buffer, int len)
 	return len;
 }
 
-ssize_t spi_write (uchar *addr, int alen, uchar *buffer, int len)
+ssize_t spi_write(uchar *addr, int alen, uchar *buffer, int len)
 {
 	struct spi_slave *slave;
 	char buf[3];
@@ -85,7 +85,7 @@ ssize_t spi_write (uchar *addr, int alen, uchar *buffer, int len)
 	spi_claim_bus(slave);
 
 	buf[0] = SPI_EEPROM_WREN;
-	if(spi_xfer(slave, 8, buf, NULL, SPI_XFER_BEGIN | SPI_XFER_END))
+	if (spi_xfer(slave, 8, buf, NULL, SPI_XFER_BEGIN | SPI_XFER_END))
 		return -1;
 
 	buf[0] = SPI_EEPROM_WRITE;
@@ -98,9 +98,9 @@ ssize_t spi_write (uchar *addr, int alen, uchar *buffer, int len)
 
 	memcpy(buf + 1, addr, alen);
 	/* command + addr, then data */
-	if(spi_xfer(slave, 24, buf, NULL, SPI_XFER_BEGIN))
+	if (spi_xfer(slave, 24, buf, NULL, SPI_XFER_BEGIN))
 		return -1;
-	if(spi_xfer(slave, len * 8, buffer, NULL, SPI_XFER_END))
+	if (spi_xfer(slave, len * 8, buffer, NULL, SPI_XFER_END))
 		return -1;
 
 	start = get_timer(0);
@@ -115,7 +115,7 @@ ssize_t spi_write (uchar *addr, int alen, uchar *buffer, int len)
 	} while (get_timer(start) < CONFIG_SYS_SPI_WRITE_TOUT);
 
 	if (buf[1] & 1)
-		printf ("*** spi_write: Time out while writing!\n");
+		printf("*** spi_write: Timeout while writing!\n");
 
 	spi_release_bus(slave);
 	spi_free_slave(slave);
-- 
1.7.8.4

[U-Boot] [PATCH 2/2] sf: eeprom_m95xxx: set a sane default timeout

[Mike Frysinger]

Every board currently defines this to the same value, so just default
to that to avoid having to make everyone do the same thing.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
 drivers/mtd/spi/eeprom_m95xxx.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/drivers/mtd/spi/eeprom_m95xxx.c b/drivers/mtd/spi/eeprom_m95xxx.c
index bae9445..88b6c34 100644
--- a/drivers/mtd/spi/eeprom_m95xxx.c
+++ b/drivers/mtd/spi/eeprom_m95xxx.c
@@ -37,6 +37,10 @@
 #define CONFIG_DEFAULT_SPI_MODE SPI_MODE_0
 #endif
 
+#ifndef CONFIG_SYS_SPI_WRITE_TOUT
+#define CONFIG_SYS_SPI_WRITE_TOUT (5 * CONFIG_SYS_HZ)
+#endif
+
 ssize_t spi_read(uchar *addr, int alen, uchar *buffer, int len)
 {
 	struct spi_slave *slave;
-- 
1.7.8.4