Skip to content

Commit

Permalink
mtd: mxc_nand.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 90ee1fb commit d4ed8f1
Showing 1 changed file with 3 additions and 12 deletions.
15 changes: 3 additions & 12 deletions drivers/mtd/nand/mxc_nand.c
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,6 @@
struct mxc_nand_host {
struct mtd_info mtd;
struct nand_chip nand;
struct mtd_partition *parts;
struct device *dev;

void *spare0;
Expand Down Expand Up @@ -1044,7 +1043,7 @@ static int __init mxcnd_probe(struct platform_device *pdev)
struct mxc_nand_platform_data *pdata = pdev->dev.platform_data;
struct mxc_nand_host *host;
struct resource *res;
int err = 0, __maybe_unused nr_parts = 0;
int err = 0;
struct nand_ecclayout *oob_smallpage, *oob_largepage;

/* Allocate memory for MTD device structure and private data */
Expand Down Expand Up @@ -1231,16 +1230,8 @@ static int __init mxcnd_probe(struct platform_device *pdev)
}

/* Register the partitions */
nr_parts =
parse_mtd_partitions(mtd, part_probes, &host->parts, 0);
if (nr_parts > 0)
mtd_device_register(mtd, host->parts, nr_parts);
else if (pdata->parts)
mtd_device_register(mtd, pdata->parts, pdata->nr_parts);
else {
pr_info("Registering %s as whole device\n", mtd->name);
mtd_device_register(mtd, NULL, 0);
}
mtd_device_parse_register(mtd, part_probes, 0,
pdata->parts, pdata->nr_parts);

platform_set_drvdata(pdev, host);

Expand Down

0 comments on commit d4ed8f1

Please sign in to comment.