Skip to content

Commit

Permalink
mtd: sharpsl.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 599501a commit 3af55a8
Showing 1 changed file with 2 additions and 9 deletions.
11 changes: 2 additions & 9 deletions drivers/mtd/nand/sharpsl.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;

Expand Down

0 comments on commit 3af55a8

Please sign in to comment.