xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mtd: sa1100-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:06 +04:00
committed by Artem Bityutskiy
parent c77d8092c7
commit 769dc43186
1 changed files with 3 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/mtd/maps/sa1100-flash.c
View File

@@ -131,10 +131,8 @@ struct sa_subdev_info {
}; };
struct sa_info { struct sa_info {
struct mtd_partition *parts;
struct mtd_info *mtd; struct mtd_info *mtd;
int num_subdev; int num_subdev;
unsigned int nr_parts;
struct sa_subdev_info subdev[0]; struct sa_subdev_info subdev[0];
}; };
@@ -231,8 +229,6 @@ static void sa1100_destroy(struct sa_info *info, struct flash_platform_data *pla
mtd_concat_destroy(info->mtd); mtd_concat_destroy(info->mtd);
} }
kfree(info->parts);
for (i = info->num_subdev - 1; i >= 0; i--) for (i = info->num_subdev - 1; i >= 0; i--)
sa1100_destroy_subdev(&info->subdev[i]); sa1100_destroy_subdev(&info->subdev[i]);
kfree(info); kfree(info);
@@ -341,10 +337,8 @@ static const char *part_probes[] = { "cmdlinepart", "RedBoot", NULL };
static int __devinit sa1100_mtd_probe(struct platform_device *pdev) static int __devinit sa1100_mtd_probe(struct platform_device *pdev)
{ {
struct flash_platform_data *plat = pdev->dev.platform_data; struct flash_platform_data *plat = pdev->dev.platform_data;
struct mtd_partition *parts;
const char *part_type = NULL;
struct sa_info *info; struct sa_info *info;
int err, nr_parts = 0; int err;
if (!plat) if (!plat)
return -ENODEV; return -ENODEV;
@@ -358,26 +352,8 @@ static int __devinit sa1100_mtd_probe(struct platform_device *pdev)
/* /*
* Partition selection stuff. * Partition selection stuff.
*/ */
nr_parts = parse_mtd_partitions(info->mtd, part_probes, &parts, 0); mtd_device_parse_register(info->mtd, part_probes, 0,
if (nr_parts > 0) { plat->parts, plat->nr_parts);
info->parts = parts;
part_type = "dynamic";
} else {
parts = plat->parts;
nr_parts = plat->nr_parts;
part_type = "static";
}
if (nr_parts == 0)
printk(KERN_NOTICE "SA1100 flash: no partition info "
"available, registering whole flash\n");
else
printk(KERN_NOTICE "SA1100 flash: using %s partition "
"definition\n", part_type);
mtd_device_register(info->mtd, parts, nr_parts);
info->nr_parts = nr_parts;
platform_set_drvdata(pdev, info); platform_set_drvdata(pdev, info);
err = 0; err = 0;