Skip to content

Commit

Permalink
mtd: s3c2410.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 ee0f6a1 commit 599501a
Showing 1 changed file with 4 additions and 14 deletions.
18 changes: 4 additions & 14 deletions drivers/mtd/nand/s3c2410.c
Original file line number Diff line number Diff line change
Expand Up @@ -748,21 +748,11 @@ static int s3c2410_nand_add_partition(struct s3c2410_nand_info *info,
struct s3c2410_nand_mtd *mtd,
struct s3c2410_nand_set *set)
{
struct mtd_partition *part_info;
int nr_part = 0;
if (set)
mtd->mtd.name = set->name;

if (set == NULL)
return mtd_device_register(&mtd->mtd, NULL, 0);

mtd->mtd.name = set->name;
nr_part = parse_mtd_partitions(&mtd->mtd, NULL, &part_info, 0);

if (nr_part <= 0 && set->nr_partitions > 0) {
nr_part = set->nr_partitions;
part_info = set->partitions;
}

return mtd_device_register(&mtd->mtd, part_info, nr_part);
return mtd_device_parse_register(&mtd->mtd, NULL, 0,
set->partitions, set->nr_partitions);
}

/**
Expand Down

0 comments on commit 599501a

Please sign in to comment.