kernel: backport upstream mtdpart.c cleanups

[openwrt/staging/lynxis.git] / target / linux / generic / patches-4.9 / 401-mtd-add-support-for-different-partition-parser-types.patch

diff --git a/target/linux/generic/patches-4.9/401-mtd-add-support-for-different-partition-parser-types.patch b/target/linux/generic/patches-4.9/401-mtd-add-support-for-different-partition-parser-types.patch
index a5e1fd7edbc894aa51ecc5dd7994cebef69da93e..71a97a00f441cef80207dc2234f0b4d7712eeea7 100644 (file)
--- a/target/linux/generic/patches-4.9/401-mtd-add-support-for-different-partition-parser-types.patch
+++ b/target/linux/generic/patches-4.9/401-mtd-add-support-for-different-partition-parser-types.patch
@@ -11,7 +11,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
 
 --- a/drivers/mtd/mtdpart.c
 +++ b/drivers/mtd/mtdpart.c
-@@ -945,6 +945,62 @@ void mtd_part_parser_cleanup(struct mtd_
+@@ -996,6 +996,62 @@ void mtd_part_parser_cleanup(struct mtd_
        }
  }
  
@@ -76,7 +76,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
        struct mtd_part *part;
 --- a/include/linux/mtd/partitions.h
 +++ b/include/linux/mtd/partitions.h
-@@ -60,11 +60,14 @@ struct mtd_part_parser_data {
+@@ -61,11 +61,14 @@ struct mtd_part_parser_data {
        unsigned long origin;
  };
  
@@ -92,7 +92,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
  struct mtd_part_parser {
        struct list_head list;
        struct module *owner;
-@@ -72,6 +75,7 @@ struct mtd_part_parser {
+@@ -73,6 +76,7 @@ struct mtd_part_parser {
        int (*parse_fn)(struct mtd_info *, const struct mtd_partition **,
                        struct mtd_part_parser_data *);
        void (*cleanup)(const struct mtd_partition *pparts, int nr_parts);
@@ -100,7 +100,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
  };
  
  /* Container for passing around a set of parsed partitions */
-@@ -104,4 +108,9 @@ uint64_t mtd_get_device_size(const struc
+@@ -105,4 +109,9 @@ uint64_t mtd_get_device_size(const struc
  extern void __weak arch_split_mtd_part(struct mtd_info *master,
                                       const char *name, int offset, int size);