sf: drop unused/duplicate command defines

In an effort to unify the spi flash drivers further, drop all the
unused and/or duplicate command defines.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>

1 files changed, 5 insertions, 18 deletions

diff --git a/drivers/mtd/spi/ramtron.c b/drivers/mtd/spi/ramtron.c
index 27d4039..0999781 100644
--- a/drivers/mtd/spi/ramtron.c
+++ b/drivers/mtd/spi/ramtron.c
@@ -54,19 +54,6 @@
 #include <spi_flash.h>
 #include "spi_flash_internal.h"
 
-/* RAMTRON commands common to all devices */
-#define CMD_RAMTRON_WREN	0x06	/* Write Enable */
-#define CMD_RAMTRON_WRDI	0x04	/* Write Disable */
-#define CMD_RAMTRON_RDSR	0x05	/* Read Status Register */
-#define CMD_RAMTRON_WRSR	0x01	/* Write Status Register */
-#define CMD_RAMTRON_READ	0x03	/* Read Data Bytes */
-#define CMD_RAMTRON_WRITE	0x02	/* Write Data Bytes */
-/* not all have those: */
-#define CMD_RAMTRON_FSTRD	0x0b	/* Fast Read (for compatibility - not used here) */
-#define CMD_RAMTRON_SLEEP	0xb9	/* Enter Sleep Mode */
-#define CMD_RAMTRON_RDID	0x9f	/* Read ID */
-#define CMD_RAMTRON_SNR		0xc3	/* Read Serial Number */
-
 /*
  * Properties of supported FRAMs
  * Note: speed is currently not used because we have no method to deliver that
@@ -196,7 +183,7 @@ static int ramtron_common(struct spi_flash *flash,
 		return ret;
 	}
 
-	if (command == CMD_RAMTRON_WRITE) {
+	if (command == CMD_PAGE_PROGRAM) {
 		/* send WREN */
 		ret = spi_flash_cmd_write_enable(flash);
 		if (ret < 0) {
@@ -206,7 +193,7 @@ static int ramtron_common(struct spi_flash *flash,
 	}
 
 	/* do the transaction */
-	if (command == CMD_RAMTRON_WRITE)
+	if (command == CMD_PAGE_PROGRAM)
 		ret = spi_flash_cmd_write(flash->spi, cmd, cmd_len, buf, len);
 	else
 		ret = spi_flash_cmd_read(flash->spi, cmd, cmd_len, buf, len);
@@ -223,14 +210,14 @@ static int ramtron_read(struct spi_flash *flash,
 		u32 offset, size_t len, void *buf)
 {
 	return ramtron_common(flash, offset, len, buf,
-		CMD_RAMTRON_READ);
+		CMD_READ_ARRAY_SLOW);
 }
 
 static int ramtron_write(struct spi_flash *flash,
 		u32 offset, size_t len, const void *buf)
 {
 	return ramtron_common(flash, offset, len, (void *)buf,
-		CMD_RAMTRON_WRITE);
+		CMD_PAGE_PROGRAM);
 }
 
 static int ramtron_erase(struct spi_flash *flash, u32 offset, size_t len)
@@ -270,7 +257,7 @@ struct spi_flash *spi_fram_probe_ramtron(struct spi_slave *spi, u8 *idcode)
 		 * We COULD have a non JEDEC conformant FRAM here,
 		 * read the status register to verify
 		 */
-		ret = spi_flash_cmd(spi, CMD_RAMTRON_RDSR, &sr, 1);
+		ret = spi_flash_cmd(spi, CMD_READ_STATUS, &sr, 1);
 		if (ret)
 			return NULL;