aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm63xx/patches-4.4/000-4.8-03-mtd-fsl-quadspi-return-amount-of-data-read-written-o.patch
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/brcm63xx/patches-4.4/000-4.8-03-mtd-fsl-quadspi-return-amount-of-data-read-written-o.patch')
-rw-r--r--target/linux/brcm63xx/patches-4.4/000-4.8-03-mtd-fsl-quadspi-return-amount-of-data-read-written-o.patch72
1 files changed, 0 insertions, 72 deletions
diff --git a/target/linux/brcm63xx/patches-4.4/000-4.8-03-mtd-fsl-quadspi-return-amount-of-data-read-written-o.patch b/target/linux/brcm63xx/patches-4.4/000-4.8-03-mtd-fsl-quadspi-return-amount-of-data-read-written-o.patch
deleted file mode 100644
index 232f11cf0d..0000000000
--- a/target/linux/brcm63xx/patches-4.4/000-4.8-03-mtd-fsl-quadspi-return-amount-of-data-read-written-o.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From fc0d7e542a0d4193521899d15f8f4999dc295323 Mon Sep 17 00:00:00 2001
-From: Michal Suchanek <hramrach@gmail.com>
-Date: Thu, 5 May 2016 17:31:49 -0700
-Subject: [PATCH 03/10] mtd: fsl-quadspi: return amount of data read/written or
- error
-
-Return amount of data read/written or error as read(2)/write(2) does.
-
-Signed-off-by: Michal Suchanek <hramrach@gmail.com>
-Signed-off-by: Brian Norris <computersforpeace@gmail.com>
----
- drivers/mtd/spi-nor/fsl-quadspi.c | 17 +++++++++++------
- 1 file changed, 11 insertions(+), 6 deletions(-)
-
---- a/drivers/mtd/spi-nor/fsl-quadspi.c
-+++ b/drivers/mtd/spi-nor/fsl-quadspi.c
-@@ -575,7 +575,7 @@ static inline void fsl_qspi_invalid(stru
- writel(reg, q->iobase + QUADSPI_MCR);
- }
-
--static int fsl_qspi_nor_write(struct fsl_qspi *q, struct spi_nor *nor,
-+static ssize_t fsl_qspi_nor_write(struct fsl_qspi *q, struct spi_nor *nor,
- u8 opcode, unsigned int to, u32 *txbuf,
- unsigned count, size_t *retlen)
- {
-@@ -604,8 +604,11 @@ static int fsl_qspi_nor_write(struct fsl
- /* Trigger it */
- ret = fsl_qspi_runcmd(q, opcode, to, count);
-
-- if (ret == 0 && retlen)
-- *retlen += count;
-+ if (ret == 0) {
-+ if (retlen)
-+ *retlen += count;
-+ return count;
-+ }
-
- return ret;
- }
-@@ -814,6 +817,8 @@ static int fsl_qspi_write_reg(struct spi
- } else if (len > 0) {
- ret = fsl_qspi_nor_write(q, nor, opcode, 0,
- (u32 *)buf, len, NULL);
-+ if (ret > 0)
-+ return 0;
- } else {
- dev_err(q->dev, "invalid cmd %d\n", opcode);
- ret = -EINVAL;
-@@ -827,12 +832,12 @@ static ssize_t fsl_qspi_write(struct spi
- {
- struct fsl_qspi *q = nor->priv;
-
-- fsl_qspi_nor_write(q, nor, nor->program_opcode, to,
-+ ssize_t ret = fsl_qspi_nor_write(q, nor, nor->program_opcode, to,
- (u32 *)buf, len, retlen);
-
- /* invalid the data in the AHB buffer. */
- fsl_qspi_invalid(q);
-- return 0;
-+ return ret;
- }
-
- static ssize_t fsl_qspi_read(struct spi_nor *nor, loff_t from,
-@@ -879,7 +884,7 @@ static ssize_t fsl_qspi_read(struct spi_
- len);
-
- *retlen += len;
-- return 0;
-+ return len;
- }
-
- static int fsl_qspi_erase(struct spi_nor *nor, loff_t offs)