mtd: spi-nor: change return value of read/write

Change the return value of spi-nor device read and write methods to
allow returning amount of data transferred and errors as
read(2)/write(2) does.

Also, start handling positive returns in spi_nor_read(), since we want
to convert drivers to start returning the read-length both via *retlen
and the return code. (We don't need to do the same transition process
for spi_nor_write(), since ->write() didn't used to have a return code
at all.)

Signed-off-by: Michal Suchanek <hramrach@gmail.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Tested-by Cyrille Pitchen <cyrille.pitchen@atmel.com>
Acked-by: Michal Suchanek <hramrach@gmail.com>
Tested-by: Michal Suchanek <hramrach@gmail.com>

diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
index 9d6854467651774182ab8895198d41ed7caaf945..3bd75e87ed89ad751e6452ebe8fda399eb25d783 100644 (file)
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -73,7 +73,7 @@ static int m25p80_write_reg(struct spi_nor *nor, u8 opcode, u8 *buf, int len)
        return spi_write(spi, flash->command, len + 1);
 }
 
-static void m25p80_write(struct spi_nor *nor, loff_t to, size_t len,
+static ssize_t m25p80_write(struct spi_nor *nor, loff_t to, size_t len,
                        size_t *retlen, const u_char *buf)
 {
        struct m25p *flash = nor->priv;
@@ -101,6 +101,7 @@ static void m25p80_write(struct spi_nor *nor, loff_t to, size_t len,
        spi_sync(spi, &m);
 
        *retlen += m.actual_length - cmd_sz;
+       return 0;
 }
 
 static inline unsigned int m25p80_rx_nbits(struct spi_nor *nor)
@@ -119,7 +120,7 @@ static inline unsigned int m25p80_rx_nbits(struct spi_nor *nor)
  * Read an address range from the nor chip.  The address range
  * may be any size provided it is within the physical boundaries.
  */
-static int m25p80_read(struct spi_nor *nor, loff_t from, size_t len,
+static ssize_t m25p80_read(struct spi_nor *nor, loff_t from, size_t len,
                        size_t *retlen, u_char *buf)
 {
        struct m25p *flash = nor->priv;

diff --git a/drivers/mtd/spi-nor/fsl-quadspi.c b/drivers/mtd/spi-nor/fsl-quadspi.c
index 9ab2b51d54b86c23392541dcd229dc62efeeb525..74dc155e1b3bb68b7418038a8dfc2c358f2e9916 100644 (file)
--- a/drivers/mtd/spi-nor/fsl-quadspi.c
+++ b/drivers/mtd/spi-nor/fsl-quadspi.c
@@ -868,7 +868,7 @@ static int fsl_qspi_write_reg(struct spi_nor *nor, u8 opcode, u8 *buf, int len)
        return ret;
 }
 
-static void fsl_qspi_write(struct spi_nor *nor, loff_t to,
+static ssize_t fsl_qspi_write(struct spi_nor *nor, loff_t to,
                size_t len, size_t *retlen, const u_char *buf)
 {
        struct fsl_qspi *q = nor->priv;
@@ -878,9 +878,10 @@ static void fsl_qspi_write(struct spi_nor *nor, loff_t to,
 
        /* invalid the data in the AHB buffer. */
        fsl_qspi_invalid(q);
+       return 0;
 }
 
-static int fsl_qspi_read(struct spi_nor *nor, loff_t from,
+static ssize_t fsl_qspi_read(struct spi_nor *nor, loff_t from,
                size_t len, size_t *retlen, u_char *buf)
 {
        struct fsl_qspi *q = nor->priv;

diff --git a/drivers/mtd/spi-nor/mtk-quadspi.c b/drivers/mtd/spi-nor/mtk-quadspi.c
index 8bed1a4cb79ce585d88623dc7d6784efaf58ccb7..ab92ac0f6b2b83ae3e84b63fe45f2b5f73ecdc51 100644 (file)
--- a/drivers/mtd/spi-nor/mtk-quadspi.c
+++ b/drivers/mtd/spi-nor/mtk-quadspi.c
@@ -243,8 +243,8 @@ static void mt8173_nor_set_addr(struct mt8173_nor *mt8173_nor, u32 addr)
        writeb(addr & 0xff, mt8173_nor->base + MTK_NOR_RADR3_REG);
 }
 
-static int mt8173_nor_read(struct spi_nor *nor, loff_t from, size_t length,
-                          size_t *retlen, u_char *buffer)
+static ssize_t mt8173_nor_read(struct spi_nor *nor, loff_t from, size_t length,
+                              size_t *retlen, u_char *buffer)
 {
        int i, ret;
        int addr = (int)from;
@@ -297,36 +297,46 @@ static int mt8173_nor_write_buffer(struct mt8173_nor *mt8173_nor, int addr,
        return mt8173_nor_execute_cmd(mt8173_nor, MTK_NOR_WR_CMD);
 }
 
-static void mt8173_nor_write(struct spi_nor *nor, loff_t to, size_t len,
-                            size_t *retlen, const u_char *buf)
+static ssize_t mt8173_nor_write(struct spi_nor *nor, loff_t to, size_t len,
+                               size_t *retlen, const u_char *buf)
 {
        int ret;
        struct mt8173_nor *mt8173_nor = nor->priv;
 
        ret = mt8173_nor_write_buffer_enable(mt8173_nor);
-       if (ret < 0)
+       if (ret < 0) {
                dev_warn(mt8173_nor->dev, "write buffer enable failed!\n");
+               return ret;
+       }
 
        while (len >= SFLASH_WRBUF_SIZE) {
                ret = mt8173_nor_write_buffer(mt8173_nor, to, buf);
-               if (ret < 0)
+               if (ret < 0) {
                        dev_err(mt8173_nor->dev, "write buffer failed!\n");
+                       return ret;
+               }
                len -= SFLASH_WRBUF_SIZE;
                to += SFLASH_WRBUF_SIZE;
                buf += SFLASH_WRBUF_SIZE;
                (*retlen) += SFLASH_WRBUF_SIZE;
        }
        ret = mt8173_nor_write_buffer_disable(mt8173_nor);
-       if (ret < 0)
+       if (ret < 0) {
                dev_warn(mt8173_nor->dev, "write buffer disable failed!\n");
+               return ret;
+       }
 
        if (len) {
                ret = mt8173_nor_write_single_byte(mt8173_nor, to, (int)len,
                                                   (u8 *)buf);
-               if (ret < 0)
+               if (ret < 0) {
                        dev_err(mt8173_nor->dev, "write single byte failed!\n");
+                       return ret;
+               }
                (*retlen) += len;
        }
+
+       return 0;
 }
 
 static int mt8173_nor_read_reg(struct spi_nor *nor, u8 opcode, u8 *buf, int len)

diff --git a/drivers/mtd/spi-nor/nxp-spifi.c b/drivers/mtd/spi-nor/nxp-spifi.c
index ae428cb0e04bb7077674adfa961d83c211501618..187adba5e69fa85c464a4d4b77a54b6c88dcd610 100644 (file)
--- a/drivers/mtd/spi-nor/nxp-spifi.c
+++ b/drivers/mtd/spi-nor/nxp-spifi.c
@@ -172,8 +172,8 @@ static int nxp_spifi_write_reg(struct spi_nor *nor, u8 opcode, u8 *buf, int len)
        return nxp_spifi_wait_for_cmd(spifi);
 }
 
-static int nxp_spifi_read(struct spi_nor *nor, loff_t from, size_t len,
-                         size_t *retlen, u_char *buf)
+static ssize_t nxp_spifi_read(struct spi_nor *nor, loff_t from, size_t len,
+                             size_t *retlen, u_char *buf)
 {
        struct nxp_spifi *spifi = nor->priv;
        int ret;
@@ -188,8 +188,8 @@ static int nxp_spifi_read(struct spi_nor *nor, loff_t from, size_t len,
        return 0;
 }
 
-static void nxp_spifi_write(struct spi_nor *nor, loff_t to, size_t len,
-                           size_t *retlen, const u_char *buf)
+static ssize_t nxp_spifi_write(struct spi_nor *nor, loff_t to, size_t len,
+                              size_t *retlen, const u_char *buf)
 {
        struct nxp_spifi *spifi = nor->priv;
        u32 cmd;
@@ -197,7 +197,7 @@ static void nxp_spifi_write(struct spi_nor *nor, loff_t to, size_t len,
 
        ret = nxp_spifi_set_memory_mode_off(spifi);
        if (ret)
-               return;
+               return ret;
 
        writel(to, spifi->io_base + SPIFI_ADDR);
        *retlen += len;
@@ -212,7 +212,7 @@ static void nxp_spifi_write(struct spi_nor *nor, loff_t to, size_t len,
        while (len--)
                writeb(*buf++, spifi->io_base + SPIFI_DATA);
 
-       nxp_spifi_wait_for_cmd(spifi);
+       return nxp_spifi_wait_for_cmd(spifi);
 }
 
 static int nxp_spifi_erase(struct spi_nor *nor, loff_t offs)

diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c
index c52e45594bfd6e78775f6250314c9cf26a049e2a..6c92b9524c8b696e506fcde0c68023ba4ff490fa 100644 (file)
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
@@ -1034,7 +1034,10 @@ static int spi_nor_read(struct mtd_info *mtd, loff_t from, size_t len,
        ret = nor->read(nor, from, len, retlen, buf);
 
        spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_READ);
-       return ret;
+       if (ret < 0)
+               return ret;
+
+       return 0;
 }
 
 static int sst_write(struct mtd_info *mtd, loff_t to, size_t len,

diff --git a/include/linux/mtd/spi-nor.h b/include/linux/mtd/spi-nor.h
index 7f041bd88b8244f8fa243c71d508e55dd08b4160..34680a493156bdd409becfa492f6133edf62a490 100644 (file)
--- a/include/linux/mtd/spi-nor.h
+++ b/include/linux/mtd/spi-nor.h
@@ -173,9 +173,9 @@ struct spi_nor {
        int (*read_reg)(struct spi_nor *nor, u8 opcode, u8 *buf, int len);
        int (*write_reg)(struct spi_nor *nor, u8 opcode, u8 *buf, int len);
 
-       int (*read)(struct spi_nor *nor, loff_t from,
+       ssize_t (*read)(struct spi_nor *nor, loff_t from,
                        size_t len, size_t *retlen, u_char *read_buf);
-       void (*write)(struct spi_nor *nor, loff_t to,
+       ssize_t (*write)(struct spi_nor *nor, loff_t to,
                        size_t len, size_t *retlen, const u_char *write_buf);
        int (*erase)(struct spi_nor *nor, loff_t offs);