summaryrefslogtreecommitdiffstats
path: root/drivers/mtd/ofpart.c
diff options
context:
space:
mode:
authorBrian Norris <computersforpeace@gmail.com>2015-10-30 20:33:29 -0700
committerBrian Norris <computersforpeace@gmail.com>2015-11-11 13:59:04 -0800
commite270bca531b40cd0a143176eb093d173b9c6f418 (patch)
tree82c862e4a59ba94d5d06b479cd29241cd2a3d1c7 /drivers/mtd/ofpart.c
parent004b5e6031f4e9fd90d565fb213b74cd06d03718 (diff)
downloadlinux-e270bca531b40cd0a143176eb093d173b9c6f418.tar.bz2
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>
Diffstat (limited to 'drivers/mtd/ofpart.c')
-rw-r--r--drivers/mtd/ofpart.c14
1 files changed, 4 insertions, 10 deletions
diff --git a/drivers/mtd/ofpart.c b/drivers/mtd/ofpart.c
index 7bf996a4cf5e..f78d2aea5545 100644
--- 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;