[U-Boot] [PATCH v3 11/13] sf: Use flash_read routine in spi_flash_read_ops

[Jagan Teki]

Use flash_read directly instead of spi_flash_read_common.

Signed-off-by: Jagan Teki <jt...@openedev.com>
---
Changes for v3:
        - none
Changes for v2:
        - none

 drivers/mtd/spi/sf_internal.h |  7 -------
 drivers/mtd/spi/sf_ops.c      | 25 +------------------------
 2 files changed, 1 insertion(+), 31 deletions(-)

diff --git a/drivers/mtd/spi/sf_internal.h b/drivers/mtd/spi/sf_internal.h
index 4dfc67d..3304217 100644
--- a/drivers/mtd/spi/sf_internal.h
+++ b/drivers/mtd/spi/sf_internal.h
@@ -222,13 +222,6 @@ int spi_flash_write_common(struct spi_flash *flash, const 
u8 *cmd,
 int spi_flash_cmd_write_ops(struct spi_flash *flash, u32 offset,
                size_t len, const void *buf);
 
-/*
- * Same as spi_flash_cmd_read() except it also claims/releases the SPI
- * bus. Used as common part of the ->read() operation.
- */
-int spi_flash_read_common(struct spi_flash *flash, const u8 *cmd,
-               size_t cmd_len, void *data, size_t data_len);
-
 /* Flash read operation, support all possible read commands */
 int spi_flash_cmd_read_ops(struct spi_flash *flash, u32 offset,
                size_t len, void *data);
diff --git a/drivers/mtd/spi/sf_ops.c b/drivers/mtd/spi/sf_ops.c
index 4c807ed..ae4a937 100644
--- a/drivers/mtd/spi/sf_ops.c
+++ b/drivers/mtd/spi/sf_ops.c
@@ -335,29 +335,6 @@ int spi_flash_cmd_write_ops(struct spi_flash *flash, u32 
offset,
        return ret;
 }
 
-int spi_flash_read_common(struct spi_flash *flash, const u8 *cmd,
-               size_t cmd_len, void *data, size_t data_len)
-{
-       struct spi_slave *spi = flash->spi;
-       int ret;
-
-       ret = spi_claim_bus(flash->spi);
-       if (ret) {
-               debug("SF: unable to claim SPI bus\n");
-               return ret;
-       }
-
-       ret = spi_flash_cmd_read(spi, cmd, cmd_len, data, data_len);
-       if (ret < 0) {
-               debug("SF: read cmd failed\n");
-               return ret;
-       }
-
-       spi_release_bus(spi);
-
-       return ret;
-}
-
 void __weak spi_flash_copy_mmap(void *data, void *offset, size_t len)
 {
        memcpy(data, offset, len);
@@ -415,7 +392,7 @@ int spi_flash_cmd_read_ops(struct spi_flash *flash, u32 
offset,
 
                spi_flash_addr(read_addr, cmd);
 
-               ret = spi_flash_read_common(flash, cmd, cmdsz, data, read_len);
+               ret = flash_read(flash, cmd, cmdsz, data, read_len);
                if (ret < 0) {
                        debug("SF: read failed\n");
                        break;
-- 
1.9.1

_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot