From: Mike Frysinger <vapier@gentoo.org>
Date: Fri, 27 Mar 2009 20:34:21 +0000 (-0400)
Subject: sf: stmicro: drop redundant id read
X-Git-Tag: v2009.06-rc1~106^2~4
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9726ba4abaa16cd6c385ad350d403f98a8eacf52;p=oweals%2Fu-boot.git

sf: stmicro: drop redundant id read

The common SPI flash code reads the idcode and passes it down to the SPI
flash driver, so there is no need to read it again ourselves.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Acked-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
CC: Jason McMullan <mcmullan@netapp.com>
CC: TsiChung Liew <Tsi-Chung.Liew@freescale.com>
---

diff --git a/drivers/mtd/spi/stmicro.c b/drivers/mtd/spi/stmicro.c
index e7dda91a40..e401cd07bc 100644
--- a/drivers/mtd/spi/stmicro.c
+++ b/drivers/mtd/spi/stmicro.c
@@ -315,12 +315,6 @@ struct spi_flash *spi_flash_probe_stmicro(struct spi_slave *spi, u8 * idcode)
 	const struct stmicro_spi_flash_params *params;
 	struct stmicro_spi_flash *stm;
 	unsigned int i;
-	int ret;
-	u8 id[3];
-
-	ret = spi_flash_cmd(spi, CMD_READ_ID, id, sizeof(id));
-	if (ret)
-		return NULL;
 
 	for (i = 0; i < ARRAY_SIZE(stmicro_spi_flash_table); i++) {
 		params = &stmicro_spi_flash_table[i];
@@ -330,7 +324,7 @@ struct spi_flash *spi_flash_probe_stmicro(struct spi_slave *spi, u8 * idcode)
 	}
 
 	if (i == ARRAY_SIZE(stmicro_spi_flash_table)) {
-		debug("SF: Unsupported STMicro ID %02x\n", id[1]);
+		debug("SF: Unsupported STMicro ID %02x\n", idcode[1]);
 		return NULL;
 	}