[U-Boot] [PATCH v6 17/23] cmd_sf: Use mtd->size instead of flash->size

[Jagan Teki]

Since mtd got added, replace flash->size with mtd->size.

Reviewed-by: Heiko Schocher <h...@denx.de>
Signed-off-by: Jagan Teki <jt...@openedev.com>
---
 common/cmd_sf.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/common/cmd_sf.c b/common/cmd_sf.c
index 42862d9..d9f1bd1 100644
--- a/common/cmd_sf.c
+++ b/common/cmd_sf.c
@@ -275,13 +275,13 @@ static int do_spi_flash_read_write(int argc, char * const 
argv[])
                return -1;
 
        if (mtd_arg_off_size(argc - 2, &argv[2], &dev, &offset, &len,
-                            &maxsize, MTD_DEV_TYPE_NOR, flash->size))
+                            &maxsize, MTD_DEV_TYPE_NOR, flash->mtd->size))
                return -1;
 
        /* Consistency checking */
-       if (offset + len > flash->size) {
-               printf("ERROR: attempting %s past flash size (%#x)\n",
-                      argv[0], flash->size);
+       if (offset + len > flash->mtd->size) {
+               printf("ERROR: attempting %s past flash size (0x%llx)\n",
+                      argv[0], flash->mtd->size);
                return 1;
        }
 
@@ -327,7 +327,7 @@ static int do_spi_flash_erase(int argc, char * const argv[])
                return -1;
 
        if (mtd_arg_off(argv[1], &dev, &offset, &len, &maxsize,
-                       MTD_DEV_TYPE_NOR, flash->size))
+                       MTD_DEV_TYPE_NOR, flash->mtd->size))
                return -1;
 
        ret = sf_parse_len_arg(argv[2], &size);
@@ -335,9 +335,9 @@ static int do_spi_flash_erase(int argc, char * const argv[])
                return -1;
 
        /* Consistency checking */
-       if (offset + size > flash->size) {
-               printf("ERROR: attempting %s past flash size (%#x)\n",
-                      argv[0], flash->size);
+       if (offset + size > flash->mtd->size) {
+               printf("ERROR: attempting %s past flash size (0x%llx)\n",
+                      argv[0], flash->mtd->size);
                return 1;
        }
 
-- 
1.9.1

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