leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mtd: h720x-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:03 +01:00 committed by David Woodhouse
parent fdbf3bf6b8
commit 360e40aedb
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/mtd/maps/h720x-flash.c
View File

@ -92,18 +92,16 @@ static int __init h720x_mtd_init(void)
if (mymtd) { if (mymtd) {
mymtd->owner = THIS_MODULE; mymtd->owner = THIS_MODULE;
#ifdef CONFIG_MTD_PARTITIONS
nr_mtd_parts = parse_mtd_partitions(mymtd, probes, &mtd_parts, 0); nr_mtd_parts = parse_mtd_partitions(mymtd, probes, &mtd_parts, 0);
if (nr_mtd_parts > 0) if (nr_mtd_parts > 0)
part_type = "command line"; part_type = "command line";
#endif
if (nr_mtd_parts <= 0) { if (nr_mtd_parts <= 0) {
mtd_parts = h720x_partitions; mtd_parts = h720x_partitions;
nr_mtd_parts = NUM_PARTITIONS; nr_mtd_parts = NUM_PARTITIONS;
part_type = "builtin"; part_type = "builtin";
} }
printk(KERN_INFO "Using %s partition table\n", part_type); printk(KERN_INFO "Using %s partition table\n", part_type);
add_mtd_partitions(mymtd, mtd_parts, nr_mtd_parts); mtd_device_register(mymtd, mtd_parts, nr_mtd_parts);
return 0; return 0;
} }
@ -118,7 +116,7 @@ static void __exit h720x_mtd_cleanup(void)
{ {
if (mymtd) { if (mymtd) {
del_mtd_partitions(mymtd); mtd_device_unregister(mymtd);
map_destroy(mymtd); map_destroy(mymtd);
} }