mirror of https://gitee.com/openkylin/linux.git
mtd: ixp2000.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
ba6bead446
commit
200b8777ce
|
@ -38,7 +38,6 @@
|
||||||
struct ixp2000_flash_info {
|
struct ixp2000_flash_info {
|
||||||
struct mtd_info *mtd;
|
struct mtd_info *mtd;
|
||||||
struct map_info map;
|
struct map_info map;
|
||||||
struct mtd_partition *partitions;
|
|
||||||
struct resource *res;
|
struct resource *res;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -125,8 +124,6 @@ static int ixp2000_flash_remove(struct platform_device *dev)
|
||||||
if (info->map.map_priv_1)
|
if (info->map.map_priv_1)
|
||||||
iounmap((void *) info->map.map_priv_1);
|
iounmap((void *) info->map.map_priv_1);
|
||||||
|
|
||||||
kfree(info->partitions);
|
|
||||||
|
|
||||||
if (info->res) {
|
if (info->res) {
|
||||||
release_resource(info->res);
|
release_resource(info->res);
|
||||||
kfree(info->res);
|
kfree(info->res);
|
||||||
|
@ -229,13 +226,7 @@ static int ixp2000_flash_probe(struct platform_device *dev)
|
||||||
}
|
}
|
||||||
info->mtd->owner = THIS_MODULE;
|
info->mtd->owner = THIS_MODULE;
|
||||||
|
|
||||||
err = parse_mtd_partitions(info->mtd, probes, &info->partitions, 0);
|
err = mtd_device_parse_register(info->mtd, probes, 0, NULL, 0);
|
||||||
if (err > 0) {
|
|
||||||
err = mtd_device_register(info->mtd, info->partitions, err);
|
|
||||||
if(err)
|
|
||||||
dev_err(&dev->dev, "Could not parse partitions\n");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (err)
|
if (err)
|
||||||
goto Error;
|
goto Error;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue