sf: unify status polling for ready bit

[u-boot.git] / drivers / mtd / spi / stmicro.c

diff --git a/drivers/mtd/spi/stmicro.c b/drivers/mtd/spi/stmicro.c
index 31340279cb872f98e0fdafe84f087ff0dc0f7786..02da8b2fdc5c09a116b680a0d3a12c2fb5d1fbda 100644 (file)
--- a/drivers/mtd/spi/stmicro.c
+++ b/drivers/mtd/spi/stmicro.c
@@ -55,8 +55,6 @@
 #define STM_ID_M25P80          0x14
 #define STM_ID_M25P128         0x18
 
-#define STMICRO_SR_WIP         (1 << 0)        /* Write-in-Progress */
-
 struct stmicro_spi_flash_params {
        u8 idcode1;
        u16 page_size;
@@ -136,40 +134,6 @@ static const struct stmicro_spi_flash_params stmicro_spi_flash_table[] = {
        },
 };
 
-static int stmicro_wait_ready(struct spi_flash *flash, unsigned long timeout)
-{
-       struct spi_slave *spi = flash->spi;
-       unsigned long timebase;
-       int ret;
-       u8 cmd = CMD_M25PXX_RDSR;
-       u8 status;
-
-       ret = spi_xfer(spi, 8, &cmd, NULL, SPI_XFER_BEGIN);
-       if (ret) {
-               debug("SF: Failed to send command %02x: %d\n", cmd, ret);
-               return ret;
-       }
-
-       timebase = get_timer(0);
-       do {
-               ret = spi_xfer(spi, 8, NULL, &status, 0);
-               if (ret)
-                       return -1;
-
-               if ((status & STMICRO_SR_WIP) == 0)
-                       break;
-
-       } while (get_timer(timebase) < timeout);
-
-       spi_xfer(spi, 0, NULL, NULL, SPI_XFER_END);
-
-       if ((status & STMICRO_SR_WIP) == 0)
-               return 0;
-
-       /* Timed out */
-       return -1;
-}
-
 static int stmicro_read_fast(struct spi_flash *flash,
                             u32 offset, size_t len, void *buf)
 {
@@ -238,11 +202,9 @@ static int stmicro_write(struct spi_flash *flash,
                        break;
                }
 
-               ret = stmicro_wait_ready(flash, SPI_FLASH_PROG_TIMEOUT);
-               if (ret < 0) {
-                       debug("SF: STMicro page programming timed out\n");
+               ret = spi_flash_cmd_wait_ready(flash, SPI_FLASH_PROG_TIMEOUT);
+               if (ret)
                        break;
-               }
 
                page_addr++;
                byte_addr = 0;
@@ -304,11 +266,9 @@ int stmicro_erase(struct spi_flash *flash, u32 offset, size_t len)
                        break;
                }
 
-               ret = stmicro_wait_ready(flash, SPI_FLASH_PAGE_ERASE_TIMEOUT);
-               if (ret < 0) {
-                       debug("SF: STMicro page erase timed out\n");
+               ret = spi_flash_cmd_wait_ready(flash, SPI_FLASH_PAGE_ERASE_TIMEOUT);
+               if (ret)
                        break;
-               }
        }
 
        debug("SF: STMicro: Successfully erased %u bytes @ 0x%x\n",