[U-Boot] [PATCH v3 16/17] sf: Remove spi_flash_cmd_poll_bit()
There is no other call other than spi_flash_cmd_wait_ready(), hence removed spi_flash_cmd_poll_bit and use the poll status code spi_flash_cmd_wait_ready() itself.
Signed-off-by: Jagannadha Sutradharudu Teki jaganna@xilinx.com --- Changes for v3: - none Changes for v2: - none
drivers/mtd/spi/spi_flash.c | 11 +++-------- drivers/mtd/spi/spi_flash_internal.h | 4 ---- 2 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/drivers/mtd/spi/spi_flash.c b/drivers/mtd/spi/spi_flash.c index 57a695a..bb37f54 100644 --- a/drivers/mtd/spi/spi_flash.c +++ b/drivers/mtd/spi/spi_flash.c @@ -194,13 +194,14 @@ int spi_flash_cmd_read_fast(struct spi_flash *flash, u32 offset, return ret; }
-int spi_flash_cmd_poll_bit(struct spi_flash *flash, unsigned long timeout, - u8 cmd, u8 poll_bit) +int spi_flash_cmd_wait_ready(struct spi_flash *flash, unsigned long timeout) { struct spi_slave *spi = flash->spi; unsigned long timebase; int ret; u8 status; + u8 poll_bit = STATUS_WIP; + u8 cmd = CMD_READ_STATUS;
ret = spi_xfer(spi, 8, &cmd, NULL, SPI_XFER_BEGIN); if (ret) { @@ -231,12 +232,6 @@ int spi_flash_cmd_poll_bit(struct spi_flash *flash, unsigned long timeout, return -1; }
-int spi_flash_cmd_wait_ready(struct spi_flash *flash, unsigned long timeout) -{ - return spi_flash_cmd_poll_bit(flash, timeout, - CMD_READ_STATUS, STATUS_WIP); -} - int spi_flash_cmd_erase(struct spi_flash *flash, u32 offset, size_t len) { u32 erase_size; diff --git a/drivers/mtd/spi/spi_flash_internal.h b/drivers/mtd/spi/spi_flash_internal.h index 12d49a8..cf6aaf3 100644 --- a/drivers/mtd/spi/spi_flash_internal.h +++ b/drivers/mtd/spi/spi_flash_internal.h @@ -100,10 +100,6 @@ int spi_flash_cmd_bankaddr_read(struct spi_flash *flash, void *data); int spi_flash_read_common(struct spi_flash *flash, const u8 *cmd, size_t cmd_len, void *data, size_t data_len);
-/* Send a command to the device and wait for some bit to clear itself. */ -int spi_flash_cmd_poll_bit(struct spi_flash *flash, unsigned long timeout, - u8 cmd, u8 poll_bit); - /* * Send the read status command to the device and wait for the wip * (write-in-progress) bit to clear itself.
On Tue, Jun 11, 2013 at 12:23 PM, Jagannadha Sutradharudu Teki < jagannadha.sutradharudu-teki@xilinx.com> wrote:
There is no other call other than spi_flash_cmd_wait_ready(), hence removed spi_flash_cmd_poll_bit and use the poll status code spi_flash_cmd_wait_ready() itself.
Signed-off-by: Jagannadha Sutradharudu Teki jaganna@xilinx.com
Reviewed-by: Simon Glass sjg@chromium.org
Changes for v3: - none
Really? It seems different.
Changes for v2: - none
drivers/mtd/spi/spi_flash.c | 11 +++-------- drivers/mtd/spi/spi_flash_internal.h | 4 ---- 2 files changed, 3 insertions(+), 12 deletions(-)
Hi Simon,
On Thu, Jun 13, 2013 at 4:09 AM, Simon Glass sjg@chromium.org wrote:
On Tue, Jun 11, 2013 at 12:23 PM, Jagannadha Sutradharudu Teki jagannadha.sutradharudu-teki@xilinx.com wrote:
There is no other call other than spi_flash_cmd_wait_ready(), hence removed spi_flash_cmd_poll_bit and use the poll status code spi_flash_cmd_wait_ready() itself.
Signed-off-by: Jagannadha Sutradharudu Teki jaganna@xilinx.com
Reviewed-by: Simon Glass sjg@chromium.org
Changes for v3: - none
Really? It seems different.
Can you please tell me what is the difference. As there is no changes in v2 to v3 i have written none was there any wrong with code style or something?
Thanks, Jagan.
participants (3)
-
Jagan Teki -
Jagannadha Sutradharudu Teki -
Simon Glass