Skip to content

Commit

Permalink
mtd: mtd_dataflash.c: use mtd_device_parse_register
Browse files Browse the repository at this point in the history
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: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
  • Loading branch information
Dmitry Eremin-Solenikov authored and Artem Bityutskiy committed Sep 11, 2011
1 parent f8214b8 commit 3a8fb12
Showing 1 changed file with 3 additions and 18 deletions.
21 changes: 3 additions & 18 deletions drivers/mtd/devices/mtd_dataflash.c
Original file line number Diff line number Diff line change
Expand Up @@ -637,8 +637,6 @@ add_dataflash_otp(struct spi_device *spi, char *name,
struct flash_platform_data *pdata = spi->dev.platform_data;
char *otp_tag = "";
int err = 0;
struct mtd_partition *parts;
int nr_parts = 0;

priv = kzalloc(sizeof *priv, GFP_KERNEL);
if (!priv)
Expand Down Expand Up @@ -677,23 +675,10 @@ add_dataflash_otp(struct spi_device *spi, char *name,
pagesize, otp_tag);
dev_set_drvdata(&spi->dev, priv);

nr_parts = parse_mtd_partitions(device, NULL, &parts, 0);
err = mtd_device_parse_register(device, NULL, 0,
pdata ? pdata->parts : NULL,
pdata ? pdata->nr_parts : 0);

if (nr_parts <= 0 && pdata && pdata->parts) {
parts = pdata->parts;
nr_parts = pdata->nr_parts;
}

if (nr_parts > 0) {
priv->partitioned = 1;
err = mtd_device_register(device, parts, nr_parts);
goto out;
}

if (mtd_device_register(device, NULL, 0) == 1)
err = -ENODEV;

out:
if (!err)
return 0;

Expand Down

0 comments on commit 3a8fb12

Please sign in to comment.