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

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

mtd: m25p80.c: use mtd_device_parse_register 



Replace custom invocations of parse_mtd_partitions and mtd_device_register
with common mtd_device_parse_register call. This would bring: standard
handling of all errors, fallback to default partitions, etc.

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

drivers/mtd/devices/m25p80.c

+3 −25
Original line number Diff line number Diff line
@@ -88,7 +88,6 @@ struct m25p { 
	struct spi_device	*spi;

	struct mutex		lock;

	struct mtd_info		mtd;

	unsigned		partitioned:1;

	u16			page_size;

	u16			addr_width;

	u8			erase_opcode;
@@ -825,8 +824,6 @@ static int __devinit m25p_probe(struct spi_device *spi) 
	struct m25p			*flash;

	struct flash_info		*info;

	unsigned			i;

	struct mtd_partition		*parts = NULL;

	int				nr_parts = 0;

	struct mtd_part_parser_data	ppdata;



	/* Platform data helps sort out which chip type we have, as
@@ -970,28 +967,9 @@ static int __devinit m25p_probe(struct spi_device *spi) 
	/* partitions should match sector boundaries; and it may be good to

	 * use readonly partitions for writeprotected sectors (BP2..BP0).

	 */

	nr_parts = parse_mtd_partitions(&flash->mtd, NULL, &parts, &ppdata);



	if (nr_parts <= 0 && data && data->parts) {

		parts = data->parts;

		nr_parts = data->nr_parts;

	}



	if (nr_parts > 0) {

		for (i = 0; i < nr_parts; i++) {

			DEBUG(MTD_DEBUG_LEVEL2, "partitions[%d] = "

			      "{.name = %s, .offset = 0x%llx, "

			      ".size = 0x%llx (%lldKiB) }\n",

			      i, parts[i].name,

			      (long long)parts[i].offset,

			      (long long)parts[i].size,

			      (long long)(parts[i].size >> 10));

		}

		flash->partitioned = 1;

	}



	return mtd_device_register(&flash->mtd, parts, nr_parts) == 1 ?

		-ENODEV : 0;

	return mtd_device_parse_register(&flash->mtd, NULL, &ppdata,

			data ? data->parts : NULL,

			data ? data->nr_parts : 0);

}