aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mtd/nand/tmio_nand.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/mtd/nand/tmio_nand.c')
-rw-r--r--drivers/mtd/nand/tmio_nand.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/mtd/nand/tmio_nand.c b/drivers/mtd/nand/tmio_nand.c
index b6ffad64cda..beebd95f769 100644
--- a/drivers/mtd/nand/tmio_nand.c
+++ b/drivers/mtd/nand/tmio_nand.c
@@ -378,8 +378,6 @@ static int tmio_probe(struct platform_device *dev)
378 struct tmio_nand *tmio; 378 struct tmio_nand *tmio;
379 struct mtd_info *mtd; 379 struct mtd_info *mtd;
380 struct nand_chip *nand_chip; 380 struct nand_chip *nand_chip;
381 struct mtd_partition *parts;
382 int nbparts = 0;
383 int retval; 381 int retval;
384 382
385 if (data == NULL) 383 if (data == NULL)
@@ -458,13 +456,9 @@ static int tmio_probe(struct platform_device *dev)
458 goto err_scan; 456 goto err_scan;
459 } 457 }
460 /* Register the partitions */ 458 /* Register the partitions */
461 nbparts = parse_mtd_partitions(mtd, NULL, &parts, 0); 459 retval = mtd_device_parse_register(mtd, NULL, 0,
462 if (nbparts <= 0 && data) { 460 data ? data->partition : NULL,
463 parts = data->partition; 461 data ? data->num_partitions : 0);
464 nbparts = data->num_partitions;
465 }
466
467 retval = mtd_device_register(mtd, parts, nbparts);
468 if (!retval) 462 if (!retval)
469 return retval; 463 return retval;
470 464