From cd4b597b1ce9ecd4d905d5801fbd2aa71d91a12c Mon Sep 17 00:00:00 2001 From: Dmitry Eremin-Solenikov Date: Thu, 2 Jun 2011 18:01:03 +0400 Subject: [PATCH] --- yaml --- r: 274855 b: refs/heads/master c: 3af55a89912e7e4b2a09d4c8c04fd884a6cf151f h: refs/heads/master i: 274853: 9880823393218f4349e4ab48d2e13235d75ea1d9 274851: 4ea9803abead5c466b45db578453908a394f2cce 274847: a4cbcf2838ff518e5f04b9d59de221d04fb704aa v: v3 --- [refs] | 2 +- trunk/drivers/mtd/nand/sharpsl.c | 11 ++--------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 8f5106f6efd7..8616b430f920 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 599501a749a1ca3baa94ac9714f06782f63439b0 +refs/heads/master: 3af55a89912e7e4b2a09d4c8c04fd884a6cf151f diff --git a/trunk/drivers/mtd/nand/sharpsl.c b/trunk/drivers/mtd/nand/sharpsl.c index b3377f88326e..619d2a504788 100644 --- a/trunk/drivers/mtd/nand/sharpsl.c +++ b/trunk/drivers/mtd/nand/sharpsl.c @@ -109,8 +109,6 @@ static int sharpsl_nand_calculate_ecc(struct mtd_info *mtd, const u_char * dat, static int __devinit sharpsl_nand_probe(struct platform_device *pdev) { struct nand_chip *this; - struct mtd_partition *sharpsl_partition_info; - int nr_partitions; struct resource *r; int err = 0; struct sharpsl_nand *sharpsl; @@ -182,14 +180,9 @@ static int __devinit sharpsl_nand_probe(struct platform_device *pdev) /* Register the partitions */ sharpsl->mtd.name = "sharpsl-nand"; - nr_partitions = parse_mtd_partitions(&sharpsl->mtd, NULL, &sharpsl_partition_info, 0); - if (nr_partitions <= 0) { - nr_partitions = data->nr_partitions; - sharpsl_partition_info = data->partitions; - } - err = mtd_device_register(&sharpsl->mtd, sharpsl_partition_info, - nr_partitions); + err = mtd_device_parse_register(&sharpsl->mtd, NULL, 0, + data->partitions, data->nr_partitions); if (err) goto err_add;