mtd: ofpart: drop 'of_node' partition parser data

This field is no longer used anywhere, as it is superseded by
mtd->dev.of_node.

Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Reviewed-by: Boris Brezillon <boris.brezillon@free-electrons.com>

diff --git a/drivers/mtd/ofpart.c b/drivers/mtd/ofpart.c
index 7bf996a4cf5eb1045cfa261b460d299738fb4a16..f78d2aea5545e8660b6c1808b3a5624717d95a0a 100644 (file)
--- a/drivers/mtd/ofpart.c
+++ b/drivers/mtd/ofpart.c
@@ -37,11 +37,8 @@ static int parse_ofpart_partitions(struct mtd_info *master,
        bool dedicated = true;
 
 
-       /*
-        * of_node can be provided through auxiliary parser data or (preferred)
-        * by assigning the master device node
-        */
-       mtd_node = data && data->of_node ? data->of_node : mtd_get_of_node(master);
+       /* Pull of_node from the master device node */
+       mtd_node = mtd_get_of_node(master);
        if (!mtd_node)
                return 0;
 
@@ -150,11 +147,8 @@ static int parse_ofoldpart_partitions(struct mtd_info *master,
        } *part;
        const char *names;
 
-       /*
-        * of_node can be provided through auxiliary parser data or (preferred)
-        * by assigning the master device node
-        */
-       dp = data && data->of_node ? data->of_node : mtd_get_of_node(master);
+       /* Pull of_node from the master device node */
+       dp = mtd_get_of_node(master);
        if (!dp)
                return 0;
 

diff --git a/include/linux/mtd/partitions.h b/include/linux/mtd/partitions.h
index e742f34b67ebb678efceea33194db457317c8257..773975a3c9e6396586a62d6cf60d651ef476ef19 100644 (file)
--- a/include/linux/mtd/partitions.h
+++ b/include/linux/mtd/partitions.h
@@ -56,13 +56,9 @@ struct device_node;
 /**
  * struct mtd_part_parser_data - used to pass data to MTD partition parsers.
  * @origin: for RedBoot, start address of MTD device
- * @of_node: for OF parsers, device node containing partitioning information.
- *           This field is deprecated, as the device node should simply be
- *           assigned to the master struct device.
  */
 struct mtd_part_parser_data {
        unsigned long origin;
-       struct device_node *of_node;
 };