redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

mtd: ofpart: drop 'of_node' partition parser data

Browse source 
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>
This commit is contained in:
Brian Norris 2015-10-30 20:33:29 -07:00
parent 004b5e6031
commit e270bca531
2 changed files with 4 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/mtd/ofpart.c
View file

@ -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;

4
include/linux/mtd/partitions.h
View file

@ -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;
};