mtd: lantiq-flash.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: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
This commit is contained in:
parent
bc413f11dd
commit
ca97dec2ab
|
@ -112,9 +112,7 @@ ltq_mtd_probe(struct platform_device *pdev)
|
|||
{
|
||||
struct physmap_flash_data *ltq_mtd_data = dev_get_platdata(&pdev->dev);
|
||||
struct ltq_mtd *ltq_mtd;
|
||||
struct mtd_partition *parts;
|
||||
struct resource *res;
|
||||
int nr_parts = 0;
|
||||
struct cfi_private *cfi;
|
||||
int err;
|
||||
|
||||
|
@ -170,16 +168,8 @@ ltq_mtd_probe(struct platform_device *pdev)
|
|||
cfi->addr_unlock1 ^= 1;
|
||||
cfi->addr_unlock2 ^= 1;
|
||||
|
||||
nr_parts = parse_mtd_partitions(ltq_mtd->mtd, NULL, &parts, 0);
|
||||
if (nr_parts > 0) {
|
||||
dev_info(&pdev->dev,
|
||||
"using %d partitions from cmdline", nr_parts);
|
||||
} else {
|
||||
nr_parts = ltq_mtd_data->nr_parts;
|
||||
parts = ltq_mtd_data->parts;
|
||||
}
|
||||
|
||||
err = add_mtd_partitions(ltq_mtd->mtd, parts, nr_parts);
|
||||
err = mtd_device_parse_register(ltq_mtd->mtd, NULL, 0,
|
||||
ltq_mtd_data->parts, ltq_mtd_data->nr_parts);
|
||||
if (err) {
|
||||
dev_err(&pdev->dev, "failed to add partitions\n");
|
||||
goto err_destroy;
|
||||
|
|
Loading…
Reference in New Issue