This field is no longer used anywhere, as it is superseded by
mtd->dev.of_node.
Signed-off-by: Brian Norris <computersforpe...@gmail.com>
---
drivers/mtd/ofpart.c | 14 ++++----------
include/linux/mtd/partitions.h | 4 ----
2 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/drivers/mtd/ofpart.c b/drivers/mtd/ofpart.c
index a5dfd73cfc7d..4368badfc653 100644
--- a/drivers/mtd/ofpart.c
+++ b/drivers/mtd/ofpart.c
@@ -35,11 +35,8 @@ static int parse_ofpart_partitions(struct mtd_info *master,
int nr_parts, i;
- /*
- * of_node can be provided through auxiliary parser data or (preferred)
- * by assigning the master device
- */
- node = data && data->of_node ? data->of_node : master->dev.of_node;
+ /* Pull of_node from the master device */
+ node = master->dev.of_node;
if (!node)
return 0;
@@ -121,11 +118,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
- */
- dp = data && data->of_node ? data->of_node : master->dev.of_node;
+ /* Pull of_node from the master device */
+ dp = master->dev.of_node;
if (!dp)
return 0;
diff --git a/include/linux/mtd/partitions.h b/include/linux/mtd/partitions.h
index e742f34b67eb..773975a3c9e6 100644
--- 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;
};
--
2.6.0.rc2.230.g3dd15c0
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
