[PATCH 22/44] mtd: atmel_nand.c: use mtd_device_parse_register

Dmitry Eremin-Solenikov
2011-06-07T13:37:23Z

drivers/mtd/nand/atmel_nand.c | 19 ++-----------------
1 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/drivers/mtd/nand/atmel_nand.c b/drivers/mtd/nand/atmel_nand.c
index a19a112..6702208 100644
--- a/drivers/mtd/nand/atmel_nand.c
+++ b/drivers/mtd/nand/atmel_nand.c
@@ -491,8 +491,6 @@ static int __init atmel_nand_probe(struct platform_device *pdev)
struct resource *regs;
struct resource *mem;
int res;
- struct mtd_partition *partitions = NULL;
- int num_partitions = 0;

mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!mem) {
@@ -651,24 +649,11 @@ static int __init atmel_nand_probe(struct platform_device *pdev)
}

mtd->name = "atmel_nand";
- num_partitions = parse_mtd_partitions(mtd, NULL, &partitions, 0);
- if (num_partitions <= 0 && host->board->parts) {
- partitions = host->board->parts;
- num_partitions = host->board->num_parts;
- }
-
- if ((!partitions) || (num_partitions == 0)) {
- printk(KERN_ERR "atmel_nand: No partitions defined, or unsupported device.\n");
- res = -ENXIO;
- goto err_no_partitions;
- }
-
- res = mtd_device_register(mtd, partitions, num_partitions);
+ res = mtd_device_parse_register(mtd, NULL, 0,
+ host->board->parts, host->board->num_parts);
if (!res)
return res;

-err_no_partitions:
- nand_release(mtd);
err_scan_tail:
err_scan_ident:
err_no_card:
--
1.7.4.4