Skip to content

Commit

Permalink
mtd: socrates_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 <dedekind1@gmail.com>
  • Loading branch information
Dmitry Eremin-Solenikov authored and Artem Bityutskiy committed Sep 11, 2011
1 parent a910649 commit b2a5a48
Showing 1 changed file with 1 addition and 10 deletions.
11 changes: 1 addition & 10 deletions drivers/mtd/nand/socrates_nand.c
Original file line number Diff line number Diff line change
Expand Up @@ -164,8 +164,6 @@ static int __devinit socrates_nand_probe(struct platform_device *ofdev)
struct mtd_info *mtd;
struct nand_chip *nand_chip;
int res;
struct mtd_partition *partitions = NULL;
int num_partitions = 0;
struct mtd_part_parser_data ppdata;

/* Allocate memory for the device structure (and zero it) */
Expand Down Expand Up @@ -225,17 +223,10 @@ static int __devinit socrates_nand_probe(struct platform_device *ofdev)
goto out;
}

num_partitions = parse_mtd_partitions(mtd, NULL, &partitions, &ppdata);
if (num_partitions < 0) {
res = num_partitions;
goto release;
}

res = mtd_device_register(mtd, partitions, num_partitions);
res = mtd_device_parse_register(mtd, NULL, &ppdata, NULL, 0);
if (!res)
return res;

release:
nand_release(mtd);

out:
Expand Down

0 comments on commit b2a5a48

Please sign in to comment.