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

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

mtd: abstract last MTD partition parser argument 



Encapsulate last MTD partition parser argument into a separate
structure. Currently it holds only 'origin' field for RedBoot parser,
but will be extended in future to contain at least device_node for OF
devices.

Amended commentary to make kerneldoc happy

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

drivers/mtd/afs.c

+2 −2
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ afs_read_iis(struct mtd_info *mtd, struct image_info_struct *iis, u_int ptr) 


static int parse_afs_partitions(struct mtd_info *mtd,

				struct mtd_partition **pparts,

                         unsigned long origin)

				struct mtd_part_parser_data *data)

{

	struct mtd_partition *parts;

	u_int mask, off, idx, sz;

drivers/mtd/ar7part.c

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ struct ar7_bin_rec { 


static int create_mtd_partitions(struct mtd_info *master,

				 struct mtd_partition **pparts,

				 unsigned long origin)

				 struct mtd_part_parser_data *data)

{

	struct ar7_bin_rec header;

	unsigned int offset;

drivers/mtd/cmdlinepart.c

+2 −2
Original line number Diff line number Diff line
@@ -314,7 +314,7 @@ static int mtdpart_setup_real(char *s) 
 */

static int parse_cmdline_partitions(struct mtd_info *master,

				    struct mtd_partition **pparts,

                             unsigned long origin)

				    struct mtd_part_parser_data *data)

{

	unsigned long offset;

	int i;

drivers/mtd/mtdcore.c

+3 −3
Original line number Diff line number Diff line
@@ -457,7 +457,7 @@ EXPORT_SYMBOL_GPL(mtd_device_register); 
 * @mtd: the MTD device to register

 * @types: the list of MTD partition probes to try, see

 *         'parse_mtd_partitions()' for more information

 * @origin: start address of MTD device, %0 unless you are sure you need this.

 * @parser_data: MTD partition parser-specific data

 * @parts: fallback partition information to register, if parsing fails;

 *         only valid if %nr_parts > %0

 * @nr_parts: the number of partitions in parts, if zero then the full
@@ -480,14 +480,14 @@ EXPORT_SYMBOL_GPL(mtd_device_register); 
 * Returns zero in case of success and a negative error code in case of failure.

 */

int mtd_device_parse_register(struct mtd_info *mtd, const char **types,

			      unsigned long origin,

			      struct mtd_part_parser_data *parser_data,

			      const struct mtd_partition *parts,

			      int nr_parts)

{

	int err;

	struct mtd_partition *real_parts;



	err = parse_mtd_partitions(mtd, types, &real_parts, origin);

	err = parse_mtd_partitions(mtd, types, &real_parts, parser_data);

	if (err <= 0 && nr_parts) {

		real_parts = kmemdup(parts, sizeof(*parts) * nr_parts,

				     GFP_KERNEL);

drivers/mtd/mtdpart.c

+4 −3
Original line number Diff line number Diff line
@@ -736,7 +736,7 @@ static const char *default_mtd_part_types[] = {"cmdlinepart", NULL}; 
 * @master: the master partition (describes whole MTD device)

 * @types: names of partition parsers to try or %NULL

 * @pparts: array of partitions found is returned here

 * @origin: MTD device start address (use %0 if unsure)

 * @data: MTD partition parser-specific data

 *

 * This function tries to find partition on MTD device @master. It uses MTD

 * partition parsers, specified in @types. However, if @types is %NULL, then
@@ -750,7 +750,8 @@ static const char *default_mtd_part_types[] = {"cmdlinepart", NULL}; 
 *   point to an array containing this number of &struct mtd_info objects.

 */

int parse_mtd_partitions(struct mtd_info *master, const char **types,

			 struct mtd_partition **pparts, unsigned long origin)

			 struct mtd_partition **pparts,

			 struct mtd_part_parser_data *data)

{

	struct mtd_part_parser *parser;

	int ret = 0;
@@ -764,7 +765,7 @@ int parse_mtd_partitions(struct mtd_info *master, const char **types, 
				parser = get_partition_parser(*types);

		if (!parser)

			continue;

		ret = (*parser->parse_fn)(master, pparts, origin);

		ret = (*parser->parse_fn)(master, pparts, data);

		if (ret > 0) {

			printk(KERN_NOTICE "%d %s partitions found on MTD device %s\n",

			       ret, parser->name, master->name);