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