diff options
| author | Dmitry Eremin-Solenikov | 2011-06-02 15:59:59 +0200 |
|---|---|---|
| committer | Artem Bityutskiy | 2011-09-11 14:02:12 +0200 |
| commit | f44dcbd06236ecc610bd03abeceac77a21cb019e (patch) | |
| tree | b12bc0b5a94d4d9c64ed28ead9bb14f1fa9e51ef /drivers | |
| parent | mtd: physmap_of: move parse_obsolete_partitions to become separate parser (diff) | |
| download | kernel-qcow2-linux-f44dcbd06236ecc610bd03abeceac77a21cb019e.tar.gz kernel-qcow2-linux-f44dcbd06236ecc610bd03abeceac77a21cb019e.tar.xz kernel-qcow2-linux-f44dcbd06236ecc610bd03abeceac77a21cb019e.zip | |
mtd: physmap_of.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 <dedekind1@gmail.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mtd/maps/physmap_of.c | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/drivers/mtd/maps/physmap_of.c b/drivers/mtd/maps/physmap_of.c index 55c4e2eefdc6..7d65f9d3e690 100644 --- a/drivers/mtd/maps/physmap_of.c +++ b/drivers/mtd/maps/physmap_of.c @@ -34,13 +34,10 @@ struct of_flash_list { struct of_flash { struct mtd_info *cmtd; - struct mtd_partition *parts; int list_size; /* number of elements in of_flash_list */ struct of_flash_list list[0]; }; -#define OF_FLASH_PARTS(info) ((info)->parts) - static int of_flash_remove(struct platform_device *dev) { struct of_flash *info; @@ -56,11 +53,8 @@ static int of_flash_remove(struct platform_device *dev) mtd_concat_destroy(info->cmtd); } - if (info->cmtd) { - if (OF_FLASH_PARTS(info)) - kfree(OF_FLASH_PARTS(info)); + if (info->cmtd) mtd_device_unregister(info->cmtd); - } for (i = 0; i < info->list_size; i++) { if (info->list[i].mtd) @@ -290,16 +284,10 @@ static int __devinit of_flash_probe(struct platform_device *dev) ppdata.of_node = dp; part_probe_types = of_get_probes(dp); - err = parse_mtd_partitions(info->cmtd, part_probe_types, - &info->parts, &ppdata); - if (err < 0) { - of_free_probes(part_probe_types); - goto err_out; - } + mtd_device_parse_register(info->cmtd, part_probe_types, &ppdata, + NULL, 0); of_free_probes(part_probe_types); - mtd_device_register(info->cmtd, info->parts, err); - kfree(mtd_list); return 0; |