aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafał Miłecki <rafal@milecki.pl>2018-11-19 13:33:05 +0100
committerRafał Miłecki <rafal@milecki.pl>2018-11-19 13:33:05 +0100
commit9b8a955358fb55b4c3c70074fc8fee27d533ba81 (patch)
tree39e5e16ce8ed12d66988d350bdb3b2edf62d9ba9
parent8e409f476b358111113353c3d3adfcff113674b8 (diff)
downloadupstream-9b8a955358fb55b4c3c70074fc8fee27d533ba81.tar.gz
upstream-9b8a955358fb55b4c3c70074fc8fee27d533ba81.tar.bz2
upstream-9b8a955358fb55b4c3c70074fc8fee27d533ba81.zip
kernel: drop mtd_pad_erasesize() helper from 4.9 and 4.14
It has been last used in kernel 3.18 for uimage and squashfs splitters embedded in the mtdpart.c. Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
-rw-r--r--target/linux/generic/pending-4.14/404-mtd-add-more-helper-functions.patch20
-rw-r--r--target/linux/generic/pending-4.9/404-mtd-add-more-helper-functions.patch20
2 files changed, 2 insertions, 38 deletions
diff --git a/target/linux/generic/pending-4.14/404-mtd-add-more-helper-functions.patch b/target/linux/generic/pending-4.14/404-mtd-add-more-helper-functions.patch
index 523ff531ad..c74a8670cb 100644
--- a/target/linux/generic/pending-4.14/404-mtd-add-more-helper-functions.patch
+++ b/target/linux/generic/pending-4.14/404-mtd-add-more-helper-functions.patch
@@ -11,25 +11,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
--- a/drivers/mtd/mtdpart.c
+++ b/drivers/mtd/mtdpart.c
-@@ -771,6 +771,17 @@ run_parsers_by_type(struct mtd_part *sla
- return nr_parts;
- }
-
-+static inline unsigned long
-+mtd_pad_erasesize(struct mtd_info *mtd, int offset, int len)
-+{
-+ unsigned long mask = mtd->erasesize - 1;
-+
-+ len += offset & mask;
-+ len = (len + mask) & ~mask;
-+ len -= offset & mask;
-+ return len;
-+}
-+
- #ifdef CONFIG_MTD_SPLIT_FIRMWARE_NAME
- #define SPLIT_FIRMWARE_NAME CONFIG_MTD_SPLIT_FIRMWARE_NAME
- #else
-@@ -1228,6 +1239,24 @@ int mtd_is_partition(const struct mtd_in
+@@ -1228,6 +1228,24 @@ int mtd_is_partition(const struct mtd_in
}
EXPORT_SYMBOL_GPL(mtd_is_partition);
diff --git a/target/linux/generic/pending-4.9/404-mtd-add-more-helper-functions.patch b/target/linux/generic/pending-4.9/404-mtd-add-more-helper-functions.patch
index 886dece4f7..3c780092c9 100644
--- a/target/linux/generic/pending-4.9/404-mtd-add-more-helper-functions.patch
+++ b/target/linux/generic/pending-4.9/404-mtd-add-more-helper-functions.patch
@@ -11,25 +11,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
--- a/drivers/mtd/mtdpart.c
+++ b/drivers/mtd/mtdpart.c
-@@ -763,6 +763,17 @@ run_parsers_by_type(struct mtd_part *sla
- return nr_parts;
- }
-
-+static inline unsigned long
-+mtd_pad_erasesize(struct mtd_info *mtd, int offset, int len)
-+{
-+ unsigned long mask = mtd->erasesize - 1;
-+
-+ len += offset & mask;
-+ len = (len + mask) & ~mask;
-+ len -= offset & mask;
-+ return len;
-+}
-+
- #ifdef CONFIG_MTD_SPLIT_FIRMWARE_NAME
- #define SPLIT_FIRMWARE_NAME CONFIG_MTD_SPLIT_FIRMWARE_NAME
- #else
-@@ -1225,6 +1236,24 @@ int mtd_is_partition(const struct mtd_in
+@@ -1225,6 +1225,24 @@ int mtd_is_partition(const struct mtd_in
}
EXPORT_SYMBOL_GPL(mtd_is_partition);