Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-15 01:24:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mtd: rename "ofpart" parser to "fixed-partitions" as it fits it better

Browse Source 
Type "ofpart" means that OF should be used to get partitioning info and
this driver supports "fixed-partitions" binding only. Renaming it should
lead to less confusion especially when parsers for new compatibility
strings start to appear.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Reviewed-by: Richard Weinberger <richard@nod.at>
Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
This commit is contained in:
Rafał Miłecki 2018-03-14 13:10:43 +01:00 committed by Boris Brezillon
parent 5b644aa012
commit c0faf43482
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/mtd/mtdpart.c
View File

@ -892,7 +892,7 @@ static int mtd_part_of_parse(struct mtd_info *master,
struct device_node *np; struct device_node *np;
struct property *prop; struct property *prop;
const char *compat; const char *compat;
const char *fixed = "ofpart"; const char *fixed = "fixed-partitions";
int ret, err = 0; int ret, err = 0;
np = of_get_child_by_name(mtd_get_of_node(master), "partitions"); np = of_get_child_by_name(mtd_get_of_node(master), "partitions");
@ -912,7 +912,7 @@ static int mtd_part_of_parse(struct mtd_info *master,
of_node_put(np); of_node_put(np);
/* /*
* For backward compatibility we have to try the "ofpart" * For backward compatibility we have to try the "fixed-partitions"
* parser. It supports old DT format with partitions specified as a * parser. It supports old DT format with partitions specified as a
* direct subnodes of a flash device DT node without any compatibility * direct subnodes of a flash device DT node without any compatibility
* specified we could match. * specified we could match.

11
drivers/mtd/ofpart.c
View File

@ -25,9 +25,9 @@ static bool node_has_compatible(struct device_node *pp)
return of_get_property(pp, "compatible", NULL); return of_get_property(pp, "compatible", NULL);
} }
static int parse_ofpart_partitions(struct mtd_info *master, static int parse_fixed_partitions(struct mtd_info *master,
const struct mtd_partition **pparts, const struct mtd_partition **pparts,
struct mtd_part_parser_data *data) struct mtd_part_parser_data *data)
{ {
struct mtd_partition *parts; struct mtd_partition *parts;
struct device_node *mtd_node; struct device_node *mtd_node;
@ -141,8 +141,8 @@ ofpart_none:
} }
static struct mtd_part_parser ofpart_parser = { static struct mtd_part_parser ofpart_parser = {
.parse_fn = parse_ofpart_partitions, .parse_fn = parse_fixed_partitions,
.name = "ofpart", .name = "fixed-partitions",
}; };
static int parse_ofoldpart_partitions(struct mtd_info *master, static int parse_ofoldpart_partitions(struct mtd_info *master,
@ -229,4 +229,5 @@ MODULE_AUTHOR("Vitaly Wool, David Gibson");
* with the same name. Since we provide the ofoldpart parser, we should have * with the same name. Since we provide the ofoldpart parser, we should have
* the corresponding alias. * the corresponding alias.
*/ */
MODULE_ALIAS("fixed-partitions");
MODULE_ALIAS("ofoldpart"); MODULE_ALIAS("ofoldpart");