[Linux-kernel-commits] [4000] trunk/drivers/mtd/devices/m25p80.c: [#3755] More beautiful solution than #3999 commit

[cooloney]

Title: [4000] trunk/drivers/mtd/devices/m25p80.c: [#3755] More beautiful solution than #3999 commit

Revision

4000

Author

cooloney

Date

2007-12-07 02:20:29 -0600 (Fri, 07 Dec 2007)

Log Message

[#3755] More beautiful solution than #3999 commit

Because only FAST_READ needs 5 bytes command, others use 4 bytes.

Diffstat

 m25p80.c |   36 ++++++++++--------------------------
 1 files changed, 10 insertions(+), 26 deletions(-)

Modified Paths

• trunk/drivers/mtd/devices/m25p80.c

Diff

Modified: trunk/drivers/mtd/devices/m25p80.c (3999 => 4000)

--- trunk/drivers/mtd/devices/m25p80.c	2007-12-07 07:37:27 UTC (rev 3999)
+++ trunk/drivers/mtd/devices/m25p80.c	2007-12-07 08:20:29 UTC (rev 4000)
@@ -54,6 +54,7 @@
 
 /* Define max times to check status register before we give up. */
 #define	MAX_READY_WAIT_COUNT	100000
+#define	CMD_SIZE		4
 
 #ifdef CONFIG_M25PXX_USE_FAST_READ
 #define OPCODE_READ 	OPCODE_FAST_READ
@@ -76,11 +77,7 @@
 	struct semaphore	lock;
 	struct mtd_info		mtd;
 	unsigned		partitioned;
-#ifdef CONFIG_M25PXX_USE_FAST_READ
-	u8			command[5];
-#else
-	u8			command[4];
-#endif
+	u8			command[CMD_SIZE + FAST_READ_DUMMY_BYTE];
 };
 
 static inline struct m25p *mtd_to_m25p(struct mtd_info *mtd)
@@ -178,12 +175,7 @@
 	flash->command[2] = offset >> 8;
 	flash->command[3] = offset;
 
-	/* NOTE:
-	 * When using FAST_READ, sizeof(flash->command) including
-	 * 1 byte DUMMY_BYTE. So cut 1 byte in erasing operation.
-	 */
-	spi_write(flash->spi, flash->command,
-		(sizeof(flash->command) - FAST_READ_DUMMY_BYTE));
+	spi_write(flash->spi, flash->command, CMD_SIZE);
 
 	return 0;
 }
@@ -267,10 +259,10 @@
 
 	/* NOTE:
 	 * OPCODE_FAST_READ (if available) is faster.
-	 * sizeof(flash->command) including 1 byte DUMMY_BYTE.
+	 * Should add 1 byte DUMMY_BYTE.
 	 */
 	t[0].tx_buf = flash->command;
-	t[0].len = sizeof(flash->command);
+	t[0].len = CMD_SIZE + FAST_READ_DUMMY_BYTE;
 	spi_message_add_tail(&t[0], &m);
 
 	t[1].rx_buf = buf;
@@ -298,7 +290,7 @@
 
 	spi_sync(flash->spi, &m);
 
-	*retlen = m.actual_length - sizeof(flash->command);
+	*retlen = m.actual_length - CMD_SIZE - FAST_READ_DUMMY_BYTE;
 
 	up(&flash->lock);
 
@@ -335,12 +327,8 @@
 	spi_message_init(&m);
 	memset(t, 0, (sizeof t));
 
-	/* NOTE:
-	 * When using FAST_READ, sizeof(flash->command) including
-	 * 1 byte DUMMY_BYTE. So cut 1 byte in writing operation.
-	 */
 	t[0].tx_buf = flash->command;
-	t[0].len = sizeof(flash->command) - FAST_READ_DUMMY_BYTE;
+	t[0].len = CMD_SIZE;
 	spi_message_add_tail(&t[0], &m);
 
 	t[1].tx_buf = buf;
@@ -369,8 +357,7 @@
 
 		spi_sync(flash->spi, &m);
 
-		*retlen = m.actual_length - sizeof(flash->command)
-				+ FAST_READ_DUMMY_BYTE;
+		*retlen = m.actual_length - CMD_SIZE;
 	} else {
 		u32 i;
 
@@ -380,8 +367,7 @@
 		t[1].len = page_size;
 		spi_sync(flash->spi, &m);
 
-		*retlen = m.actual_length - sizeof(flash->command)
-				+ FAST_READ_DUMMY_BYTE;
+		*retlen = m.actual_length - CMD_SIZE;
 
 		/* write everything in PAGESIZE chunks */
 		for (i = page_size; i < len; i += page_size) {
@@ -404,9 +390,7 @@
 			spi_sync(flash->spi, &m);
 
 			if (retlen)
-				*retlen += m.actual_length
-					- sizeof(flash->command)
-					+ FAST_READ_DUMMY_BYTE;
+				*retlen += m.actual_length - CMD_SIZE;
 		}
 	}
 

_______________________________________________
Linux-kernel-commits mailing list
Linux-kernel-commits@blackfin.uclinux.org
http://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits