Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d26c87d6 authored by Dmitry Eremin-Solenikov's avatar Dmitry Eremin-Solenikov Committed by Artem Bityutskiy
Browse files

mtd: prepare to convert of_mtd_parse_partitions to partition parser 



Prepare to convert of_mtd_parse_partitions() to usual partitions parser:
1) Register ofpart parser
2) Internally don't use passed device for error printing
3) Add device_node to mtd_part_parser_data struct
4) Move of_mtd_parse_partitions from __devinit to common text section
5) add ofpart to the default list of partition parsers

Signed-off-by: default avatarDmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: default avatarArtem Bityutskiy <dedekind1@gmail.com>
parent c7975330

drivers/mtd/mtdpart.c

+6 −2
Original line number Diff line number Diff line
@@ -729,7 +729,11 @@ EXPORT_SYMBOL_GPL(deregister_mtd_parser); 
 * Do not forget to update 'parse_mtd_partitions()' kerneldoc comment if you

 * are changing this array!

 */

static const char *default_mtd_part_types[] = {"cmdlinepart", NULL};

static const char *default_mtd_part_types[] = {

	"cmdlinepart",

	"ofpart",

	NULL

};



/**

 * parse_mtd_partitions - parse MTD partitions
@@ -741,7 +745,7 @@ static const char *default_mtd_part_types[] = {"cmdlinepart", NULL}; 
 * This function tries to find partition on MTD device @master. It uses MTD

 * partition parsers, specified in @types. However, if @types is %NULL, then

 * the default list of parsers is used. The default list contains only the

 * "cmdlinepart" parser ATM.

 * "cmdlinepart" and "ofpart" parsers ATM.

 *

 * This function may return:

 * o a negative error code in case of failure

drivers/mtd/ofpart.c

+25 −2
Original line number Diff line number Diff line
@@ -20,7 +20,17 @@ 
#include <linux/slab.h>

#include <linux/mtd/partitions.h>



int __devinit of_mtd_parse_partitions(struct device *dev,

static int parse_ofpart_partitions(struct mtd_info *master,

				   struct mtd_partition **pparts,

				   struct mtd_part_parser_data *data)

{

	if (!data || !data->of_node)

		return 0;



	return of_mtd_parse_partitions(NULL, data->of_node, pparts);

}



int of_mtd_parse_partitions(struct device *dev,

                                      struct device_node *node,

                                      struct mtd_partition **pparts)

{
@@ -69,7 +79,7 @@ int __devinit of_mtd_parse_partitions(struct device *dev, 


	if (!i) {

		of_node_put(pp);

		dev_err(dev, "No valid partition found on %s\n", node->full_name);

		pr_err("No valid partition found on %s\n", node->full_name);

		kfree(*pparts);

		*pparts = NULL;

		return -EINVAL;
@@ -79,4 +89,17 @@ int __devinit of_mtd_parse_partitions(struct device *dev, 
}

EXPORT_SYMBOL(of_mtd_parse_partitions);



static struct mtd_part_parser ofpart_parser = {

	.owner = THIS_MODULE,

	.parse_fn = parse_ofpart_partitions,

	.name = "ofpart",

};



static int __init ofpart_parser_init(void)

{

	return register_mtd_parser(&ofpart_parser);

}



module_init(ofpart_parser_init);



MODULE_LICENSE("GPL");

include/linux/mtd/partitions.h

+4 −1
Original line number Diff line number Diff line
@@ -51,13 +51,16 @@ struct mtd_partition { 




struct mtd_info;

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

 */

struct mtd_part_parser_data {

	unsigned long origin;

	struct device_node *of_node;

};
@@ -85,7 +88,7 @@ struct device; 
struct device_node;



#ifdef CONFIG_MTD_OF_PARTS

int __devinit of_mtd_parse_partitions(struct device *dev,

int of_mtd_parse_partitions(struct device *dev,

                                      struct device_node *node,

                                      struct mtd_partition **pparts);

#else