From afaf0c067b059f814f64fb7ffd55af670be5b110 Mon Sep 17 00:00:00 2001 From: Jagannadha Sutradharudu Teki Date: Thu, 16 May 2013 00:30:13 +0530 Subject: [PATCH] sf: Remove unnecessary idcode0 arg in spi_flash_cmd_bankaddr_read|write() idcode0 is stored in flash->idcode0 at probe time, hence removed unnecessary idcode0 arg in spi_flash_cmd_bankaddr_read|write() Signed-off-by: Jagannadha Sutradharudu Teki --- drivers/mtd/spi/spi_flash.c | 14 +++++++------- drivers/mtd/spi/spi_flash_internal.h | 6 ++---- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/drivers/mtd/spi/spi_flash.c b/drivers/mtd/spi/spi_flash.c index d6f2e9a21fa..99a39ad8412 100644 --- a/drivers/mtd/spi/spi_flash.c +++ b/drivers/mtd/spi/spi_flash.c @@ -32,7 +32,7 @@ static int spi_flash_bank(struct spi_flash *flash, u32 addr, u8 *bank_sel) if ((flash->spi->is_dual == 1) && (flash->spi->u_page == 1)) *bank_sel -= ((flash->size / 2) / SPI_FLASH_16MB_BOUN); - return spi_flash_cmd_bankaddr_write(flash, *bank_sel, flash->idcode0); + return spi_flash_cmd_bankaddr_write(flash, *bank_sel); } static int spi_flash_read_write(struct spi_slave *spi, @@ -370,10 +370,9 @@ int spi_flash_cmd_write_status(struct spi_flash *flash, u8 sr) return 0; } -int spi_flash_cmd_bankaddr_write(struct spi_flash *flash, - u8 bank_sel, u8 idcode0) +int spi_flash_cmd_bankaddr_write(struct spi_flash *flash, u8 bank_sel) { - u8 cmd; + u8 cmd, idcode0; int ret; if (flash->bank_curr == bank_sel) { @@ -381,6 +380,7 @@ int spi_flash_cmd_bankaddr_write(struct spi_flash *flash, return 0; } + idcode0 = flash->idcode0; if (idcode0 == 0x01) { cmd = CMD_BANKADDR_BRWR; } else if ((idcode0 == 0xef) || (idcode0 == 0x20)) { @@ -413,9 +413,10 @@ int spi_flash_cmd_bankaddr_write(struct spi_flash *flash, return 0; } -int spi_flash_cmd_bankaddr_read(struct spi_flash *flash, void *data, u8 idcode0) +int spi_flash_cmd_bankaddr_read(struct spi_flash *flash, void *data) { u8 cmd; + u8 idcode0 = flash->idcode0; if (idcode0 == 0x01) { cmd = CMD_BANKADDR_BRRD; @@ -594,8 +595,7 @@ struct spi_flash *spi_flash_probe(unsigned int bus, unsigned int cs, (((flash->spi->is_dual == 1) || (flash->spi->is_dual == 2)) && ((flash->size / 2) > SPI_FLASH_16MB_BOUN))) { - if (spi_flash_cmd_bankaddr_read(flash, &curr_bank, - flash->idcode0)) { + if (spi_flash_cmd_bankaddr_read(flash, &curr_bank)) { debug("SF: fail to read bank addr register\n"); goto err_manufacturer_probe; } diff --git a/drivers/mtd/spi/spi_flash_internal.h b/drivers/mtd/spi/spi_flash_internal.h index 11304e59a77..f2548f3ac49 100644 --- a/drivers/mtd/spi/spi_flash_internal.h +++ b/drivers/mtd/spi/spi_flash_internal.h @@ -89,12 +89,10 @@ static inline int spi_flash_cmd_write_disable(struct spi_flash *flash) int spi_flash_cmd_write_status(struct spi_flash *flash, u8 sr); /* Program the bank address register */ -int spi_flash_cmd_bankaddr_write(struct spi_flash *flash, - u8 bank_sel, u8 idcode0); +int spi_flash_cmd_bankaddr_write(struct spi_flash *flash, u8 bank_sel); /* Read the bank address register */ -int spi_flash_cmd_bankaddr_read(struct spi_flash *flash, - void *data, u8 idcode0); +int spi_flash_cmd_bankaddr_read(struct spi_flash *flash, void *data); /* * Same as spi_flash_cmd_read() except it also claims/releases the SPI -- 2.47.3