asgardius/android_kernel_motorola_sm6225
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mtd: rbtx4939-flash.c: use mtd_device_parse_register

Browse source 
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:
Dmitry Eremin-Solenikov 2011-06-02 18:00:04 +04:00 committed by Artem Bityutskiy
parent 6fcdc92fce
commit c77d8092c7
1 changed files with 4 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
drivers/mtd/maps/rbtx4939-flash.c
View file

@ -25,8 +25,6 @@
struct rbtx4939_flash_info { struct rbtx4939_flash_info {
struct mtd_info *mtd; struct mtd_info *mtd;
struct map_info map; struct map_info map;
int nr_parts;
struct mtd_partition *parts;
}; };
static int rbtx4939_flash_remove(struct platform_device *dev) static int rbtx4939_flash_remove(struct platform_device *dev)
@ -41,8 +39,6 @@ static int rbtx4939_flash_remove(struct platform_device *dev)
if (info->mtd) { if (info->mtd) {
struct rbtx4939_flash_data *pdata = dev->dev.platform_data; struct rbtx4939_flash_data *pdata = dev->dev.platform_data;
if (info->nr_parts)
kfree(info->parts);
mtd_device_unregister(info->mtd); mtd_device_unregister(info->mtd);
map_destroy(info->mtd); map_destroy(info->mtd);
} }
@ -106,20 +102,11 @@ static int rbtx4939_flash_probe(struct platform_device *dev)
info->mtd->owner = THIS_MODULE; info->mtd->owner = THIS_MODULE;
if (err) if (err)
goto err_out; goto err_out;
err = parse_mtd_partitions(info->mtd, NULL, &info->parts, 0); err = mtd_device_parse_register(info->mtd, NULL, 0,
if (err > 0) { pdata->parts, pdata->nr_parts);
mtd_device_register(info->mtd, info->parts, err);
info->nr_parts = err;
return 0;
}
if (pdata->nr_parts) { if (err)
pr_notice("Using rbtx4939 partition information\n"); goto err_out;
mtd_device_register(info->mtd, pdata->parts, pdata->nr_parts);
return 0;
}
mtd_device_register(info->mtd, NULL, 0);
return 0; return 0;
err_out: err_out: