torvalds/linux
torvalds/linux
2
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-04 20:19:47 +08:00
Code

mtd: rbtx4939-flash: convert to mtd_device_register()

Browse Source 
Convert to mtd_device_register() and remove the CONFIG_MTD_PARTITIONS
preprocessor conditionals as partitioning is always available.

Signed-off-by: Jamie Iles <jamie@jamieiles.com>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
This commit is contained in:
Jamie Iles 2011-05-23 10:23:08 +01:00 committed by David Woodhouse
parent 095dd5003f
commit 16b0eb1543
1 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/mtd/maps/rbtx4939-flash.c
View File

@ -25,10 +25,8 @@
struct rbtx4939_flash_info { struct rbtx4939_flash_info {
struct mtd_info *mtd; struct mtd_info *mtd;
struct map_info map; struct map_info map;
#ifdef CONFIG_MTD_PARTITIONS
int nr_parts; int nr_parts;
struct mtd_partition *parts; struct mtd_partition *parts;
#endif
}; };
static int rbtx4939_flash_remove(struct platform_device *dev) static int rbtx4939_flash_remove(struct platform_device *dev)
@ -41,28 +39,18 @@ static int rbtx4939_flash_remove(struct platform_device *dev)
platform_set_drvdata(dev, NULL); platform_set_drvdata(dev, NULL);
if (info->mtd) { if (info->mtd) {
#ifdef CONFIG_MTD_PARTITIONS
struct rbtx4939_flash_data *pdata = dev->dev.platform_data; struct rbtx4939_flash_data *pdata = dev->dev.platform_data;
if (info->nr_parts) { if (info->nr_parts)
del_mtd_partitions(info->mtd);
kfree(info->parts); kfree(info->parts);
} else if (pdata->nr_parts) mtd_device_unregister(info->mtd);
del_mtd_partitions(info->mtd);
else
del_mtd_device(info->mtd);
#else
del_mtd_device(info->mtd);
#endif
map_destroy(info->mtd); map_destroy(info->mtd);
} }
return 0; return 0;
} }
static const char *rom_probe_types[] = { "cfi_probe", "jedec_probe", NULL }; static const char *rom_probe_types[] = { "cfi_probe", "jedec_probe", NULL };
#ifdef CONFIG_MTD_PARTITIONS
static const char *part_probe_types[] = { "cmdlinepart", NULL }; static const char *part_probe_types[] = { "cmdlinepart", NULL };
#endif
static int rbtx4939_flash_probe(struct platform_device *dev) static int rbtx4939_flash_probe(struct platform_device *dev)
{ {
@ -120,23 +108,21 @@ static int rbtx4939_flash_probe(struct platform_device *dev)
if (err) if (err)
goto err_out; goto err_out;
#ifdef CONFIG_MTD_PARTITIONS
err = parse_mtd_partitions(info->mtd, part_probe_types, err = parse_mtd_partitions(info->mtd, part_probe_types,
&info->parts, 0); &info->parts, 0);
if (err > 0) { if (err > 0) {
add_mtd_partitions(info->mtd, info->parts, err); mtd_device_register(info->mtd, info->parts, err);
info->nr_parts = err; info->nr_parts = err;
return 0; return 0;
} }
if (pdata->nr_parts) { if (pdata->nr_parts) {
pr_notice("Using rbtx4939 partition information\n"); pr_notice("Using rbtx4939 partition information\n");
add_mtd_partitions(info->mtd, pdata->parts, pdata->nr_parts); mtd_device_register(info->mtd, pdata->parts, pdata->nr_parts);
return 0; return 0;
} }
#endif
add_mtd_device(info->mtd); mtd_device_register(info->mtd, NULL, 0);
return 0; return 0;
err_out: err_out: