[PATCH V3 4/6] nvmem: u-boot-env: use nvmem device helpers

[Rafał Miłecki]

From: Rafał Miłecki <ra...@milecki.pl>

Use nvmem_dev_size() and nvmem_device_read() to make this driver less
mtd dependent.

Signed-off-by: Rafał Miłecki <ra...@milecki.pl>
Reviewed-by: Miquel Raynal <miquel.ray...@bootlin.com>
---
V2: Don't introduce memleak when handling nvmem_device_read() failures
V3: Split PATCH 3/3 into two

 drivers/nvmem/u-boot-env.c | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/drivers/nvmem/u-boot-env.c b/drivers/nvmem/u-boot-env.c
index dd9d0ad22712..111905189341 100644
--- a/drivers/nvmem/u-boot-env.c
+++ b/drivers/nvmem/u-boot-env.c
@@ -127,27 +127,34 @@ static int u_boot_env_add_cells(struct u_boot_env *priv, 
uint8_t *buf,
 
 static int u_boot_env_parse(struct u_boot_env *priv)
 {
+       struct nvmem_device *nvmem = priv->nvmem;
        struct device *dev = priv->dev;
        size_t crc32_data_offset;
        size_t crc32_data_len;
        size_t crc32_offset;
        size_t data_offset;
        size_t data_len;
+       size_t dev_size;
        uint32_t crc32;
        uint32_t calc;
-       size_t bytes;
        uint8_t *buf;
+       int bytes;
        int err;
 
-       buf = kcalloc(1, priv->mtd->size, GFP_KERNEL);
+       dev_size = nvmem_dev_size(nvmem);
+
+       buf = kcalloc(1, dev_size, GFP_KERNEL);
        if (!buf) {
                err = -ENOMEM;
                goto err_out;
        }
 
-       err = mtd_read(priv->mtd, 0, priv->mtd->size, &bytes, buf);
-       if ((err && !mtd_is_bitflip(err)) || bytes != priv->mtd->size) {
-               dev_err(dev, "Failed to read from mtd: %d\n", err);
+       bytes = nvmem_device_read(nvmem, 0, dev_size, buf);
+       if (bytes < 0) {
+               err = bytes;
+               goto err_kfree;
+       } else if (bytes != dev_size) {
+               err = -EIO;
                goto err_kfree;
        }
 
@@ -169,8 +176,8 @@ static int u_boot_env_parse(struct u_boot_env *priv)
                break;
        }
        crc32 = le32_to_cpu(*(__le32 *)(buf + crc32_offset));
-       crc32_data_len = priv->mtd->size - crc32_data_offset;
-       data_len = priv->mtd->size - data_offset;
+       crc32_data_len = dev_size - crc32_data_offset;
+       data_len = dev_size - data_offset;
 
        calc = crc32(~0, buf + crc32_data_offset, crc32_data_len) ^ ~0L;
        if (calc != crc32) {
@@ -179,7 +186,7 @@ static int u_boot_env_parse(struct u_boot_env *priv)
                goto err_kfree;
        }
 
-       buf[priv->mtd->size - 1] = '\0';
+       buf[dev_size - 1] = '\0';
        err = u_boot_env_add_cells(priv, buf, data_offset, data_len);
        if (err)
                dev_err(dev, "Failed to add cells: %d\n", err);
-- 
2.35.3