aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-4.9/065-v4.13-0002-mtd-partitions-factor-out-code-calling-parser.patch
diff options
context:
space:
mode:
authorRafał Miłecki <rafal@milecki.pl>2017-06-23 10:27:20 +0200
committerRafał Miłecki <rafal@milecki.pl>2017-06-23 11:40:05 +0200
commit8c1e760ab60994de26d2a2c85f91e86192999dfb (patch)
tree741281d011dac79b540cc69ed4cd39f6a426ecb8 /target/linux/generic/patches-4.9/065-v4.13-0002-mtd-partitions-factor-out-code-calling-parser.patch
parent4052443a235433fb97af9711bf6429cd05820ba9 (diff)
downloadupstream-8c1e760ab60994de26d2a2c85f91e86192999dfb.tar.gz
upstream-8c1e760ab60994de26d2a2c85f91e86192999dfb.tar.bz2
upstream-8c1e760ab60994de26d2a2c85f91e86192999dfb.zip
kernel: backport upstream mtdpart.c cleanups
Except for renames and line changes the only conflict was in allocate_partition in handling MTD_WRITEABLE. Hopefully it was handled correctly. Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Diffstat (limited to 'target/linux/generic/patches-4.9/065-v4.13-0002-mtd-partitions-factor-out-code-calling-parser.patch')
-rw-r--r--target/linux/generic/patches-4.9/065-v4.13-0002-mtd-partitions-factor-out-code-calling-parser.patch68
1 files changed, 68 insertions, 0 deletions
diff --git a/target/linux/generic/patches-4.9/065-v4.13-0002-mtd-partitions-factor-out-code-calling-parser.patch b/target/linux/generic/patches-4.9/065-v4.13-0002-mtd-partitions-factor-out-code-calling-parser.patch
new file mode 100644
index 0000000000..d312e081a9
--- /dev/null
+++ b/target/linux/generic/patches-4.9/065-v4.13-0002-mtd-partitions-factor-out-code-calling-parser.patch
@@ -0,0 +1,68 @@
+From 01f9c7240a900d5676a8496496f2974dd36996b1 Mon Sep 17 00:00:00 2001
+From: Brian Norris <computersforpeace@gmail.com>
+Date: Tue, 23 May 2017 07:30:20 +0200
+Subject: [PATCH] mtd: partitions: factor out code calling parser
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This code is going to be reused for parsers matched using OF so let's
+factor it out to make this easier.
+
+Signed-off-by: Brian Norris <computersforpeace@gmail.com>
+Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
+Acked-by: Brian Norris <computersforpeace@gmail.com>
+---
+ drivers/mtd/mtdpart.c | 33 ++++++++++++++++++++++++---------
+ 1 file changed, 24 insertions(+), 9 deletions(-)
+
+--- a/drivers/mtd/mtdpart.c
++++ b/drivers/mtd/mtdpart.c
+@@ -807,6 +807,27 @@ static const char * const default_mtd_pa
+ NULL
+ };
+
++static int mtd_part_do_parse(struct mtd_part_parser *parser,
++ struct mtd_info *master,
++ struct mtd_partitions *pparts,
++ struct mtd_part_parser_data *data)
++{
++ int ret;
++
++ ret = (*parser->parse_fn)(master, &pparts->parts, data);
++ pr_debug("%s: parser %s: %i\n", master->name, parser->name, ret);
++ if (ret <= 0)
++ return ret;
++
++ pr_notice("%d %s partitions found on MTD device %s\n", ret,
++ parser->name, master->name);
++
++ pparts->nr_parts = ret;
++ pparts->parser = parser;
++
++ return ret;
++}
++
+ /**
+ * parse_mtd_partitions - parse MTD partitions
+ * @master: the master partition (describes whole MTD device)
+@@ -847,16 +868,10 @@ int parse_mtd_partitions(struct mtd_info
+ parser ? parser->name : NULL);
+ if (!parser)
+ continue;
+- ret = (*parser->parse_fn)(master, &pparts->parts, data);
+- pr_debug("%s: parser %s: %i\n",
+- master->name, parser->name, ret);
+- if (ret > 0) {
+- printk(KERN_NOTICE "%d %s partitions found on MTD device %s\n",
+- ret, parser->name, master->name);
+- pparts->nr_parts = ret;
+- pparts->parser = parser;
++ ret = mtd_part_do_parse(parser, master, pparts, data);
++ /* Found partitions! */
++ if (ret > 0)
+ return 0;
+- }
+ mtd_part_parser_put(parser);
+ /*
+ * Stash the first error we see; only report it if no parser