Commit b2a5a487 authored by Dmitry Eremin-Solenikov's avatar Dmitry Eremin-Solenikov Committed by Artem Bityutskiy

mtd: socrates_nand.c: use mtd_device_parse_register

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: default avatarDmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: default avatarArtem Bityutskiy <dedekind1@gmail.com>
parent a9106497
...@@ -164,8 +164,6 @@ static int __devinit socrates_nand_probe(struct platform_device *ofdev) ...@@ -164,8 +164,6 @@ static int __devinit socrates_nand_probe(struct platform_device *ofdev)
struct mtd_info *mtd; struct mtd_info *mtd;
struct nand_chip *nand_chip; struct nand_chip *nand_chip;
int res; int res;
struct mtd_partition *partitions = NULL;
int num_partitions = 0;
struct mtd_part_parser_data ppdata; struct mtd_part_parser_data ppdata;
/* Allocate memory for the device structure (and zero it) */ /* Allocate memory for the device structure (and zero it) */
...@@ -225,17 +223,10 @@ static int __devinit socrates_nand_probe(struct platform_device *ofdev) ...@@ -225,17 +223,10 @@ static int __devinit socrates_nand_probe(struct platform_device *ofdev)
goto out; goto out;
} }
num_partitions = parse_mtd_partitions(mtd, NULL, &partitions, &ppdata); res = mtd_device_parse_register(mtd, NULL, &ppdata, NULL, 0);
if (num_partitions < 0) {
res = num_partitions;
goto release;
}
res = mtd_device_register(mtd, partitions, num_partitions);
if (!res) if (!res)
return res; return res;
release:
nand_release(mtd); nand_release(mtd);
out: out:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment