0ddae04c22
Should fix parser data containing uninitialized values for of probed physmap flashes, which could break e.g. the redboot parser. Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
61 lines
2 KiB
Diff
61 lines
2 KiB
Diff
From e270bca531b40cd0a143176eb093d173b9c6f418 Mon Sep 17 00:00:00 2001
|
|
From: Brian Norris <computersforpeace@gmail.com>
|
|
Date: Fri, 30 Oct 2015 20:33:29 -0700
|
|
Subject: [PATCH] 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>
|
|
---
|
|
drivers/mtd/ofpart.c | 14 ++++----------
|
|
include/linux/mtd/partitions.h | 4 ----
|
|
2 files changed, 4 insertions(+), 14 deletions(-)
|
|
|
|
--- a/drivers/mtd/ofpart.c
|
|
+++ b/drivers/mtd/ofpart.c
|
|
@@ -37,11 +37,8 @@ static int parse_ofpart_partitions(struc
|
|
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;
|
|
|
|
@@ -158,11 +155,8 @@ static int parse_ofoldpart_partitions(st
|
|
} *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;
|
|
|
|
--- 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;
|
|
};
|
|
|
|
|