aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ipq40xx/patches-4.14/031-mtd-nand-use-usual-return-values-for-the-erase-hook.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2020-02-29 16:36:21 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2020-03-12 09:28:23 +0100
commit988546cd136aab66493ab5564601b25164fb6ecb (patch)
tree57f6a9601632ece80e355423c2fb8f5d0874e7c6 /target/linux/ipq40xx/patches-4.14/031-mtd-nand-use-usual-return-values-for-the-erase-hook.patch
parent8e6a8a08d2a3f23ff8accb065818808209eeceaa (diff)
downloadupstream-988546cd136aab66493ab5564601b25164fb6ecb.tar.gz
upstream-988546cd136aab66493ab5564601b25164fb6ecb.tar.bz2
upstream-988546cd136aab66493ab5564601b25164fb6ecb.zip
ipq40xx: Remove kernel 4.14 support
This target was switched to kernel 4.19 more than 6 months ago in commit f342ffd300da ("treewide: kernel: bump some targets to 4.19") and now with kernel 5.4 support being added it gets harder to support kernel 4.14 in addition to kernel 4.19 and 5.4. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/ipq40xx/patches-4.14/031-mtd-nand-use-usual-return-values-for-the-erase-hook.patch')
-rw-r--r--target/linux/ipq40xx/patches-4.14/031-mtd-nand-use-usual-return-values-for-the-erase-hook.patch48
1 files changed, 0 insertions, 48 deletions
diff --git a/target/linux/ipq40xx/patches-4.14/031-mtd-nand-use-usual-return-values-for-the-erase-hook.patch b/target/linux/ipq40xx/patches-4.14/031-mtd-nand-use-usual-return-values-for-the-erase-hook.patch
deleted file mode 100644
index 962baeb2b5..0000000000
--- a/target/linux/ipq40xx/patches-4.14/031-mtd-nand-use-usual-return-values-for-the-erase-hook.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From eb94555e9e97c9983461214046b4d72c4ab4ba70 Mon Sep 17 00:00:00 2001
-From: Miquel Raynal <miquel.raynal@free-electrons.com>
-Date: Thu, 30 Nov 2017 18:01:28 +0100
-Subject: [PATCH] mtd: nand: use usual return values for the ->erase() hook
-
-Avoid using specific defined values for checking returned status of the
-->erase() hook. Instead, use usual negative error values on failure,
-zero otherwise.
-
-Signed-off-by: Miquel Raynal <miquel.raynal@free-electrons.com>
-Acked-by: Masahiro Yamada <yamada.masahiro@socionext.com>
-Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
----
- drivers/mtd/nand/denali.c | 2 +-
- drivers/mtd/nand/docg4.c | 7 ++++++-
- drivers/mtd/nand/nand_base.c | 10 ++++++++--
- 3 files changed, 15 insertions(+), 4 deletions(-)
-
---- a/drivers/mtd/nand/nand_base.c
-+++ b/drivers/mtd/nand/nand_base.c
-@@ -2994,11 +2994,17 @@ out:
- static int single_erase(struct mtd_info *mtd, int page)
- {
- struct nand_chip *chip = mtd_to_nand(mtd);
-+ int status;
-+
- /* Send commands to erase a block */
- chip->cmdfunc(mtd, NAND_CMD_ERASE1, -1, page);
- chip->cmdfunc(mtd, NAND_CMD_ERASE2, -1, -1);
-
-- return chip->waitfunc(mtd, chip);
-+ status = chip->waitfunc(mtd, chip);
-+ if (status < 0)
-+ return status;
-+
-+ return status & NAND_STATUS_FAIL ? -EIO : 0;
- }
-
- /**
-@@ -3082,7 +3088,7 @@ int nand_erase_nand(struct mtd_info *mtd
- status = chip->erase(mtd, page & chip->pagemask);
-
- /* See if block erase succeeded */
-- if (status & NAND_STATUS_FAIL) {
-+ if (status) {
- pr_debug("%s: failed erase, page 0x%08x\n",
- __func__, page);
- instr->state = MTD_ERASE_FAILED;