diff options
| author |   Jamie Iles <jamie@jamieiles.com> | 2011-05-23 10:23:03 +0100 |
|---|---|---|
| committer |   David Woodhouse <David.Woodhouse@intel.com> | 2011-05-25 02:21:46 +0100 |
| commit | 360e40aedb59799fef4ff58fe6b9436cd487f6e6 (patch) | |
| tree | bd44a98c3955845b46e7b4cbc4ba6e55dd2d0fb9 /drivers/mtd | |
| parent | mtd: gpio-addr-flash: convert to mtd_device_register() (diff) | |
| download | linux-dev-360e40aedb59799fef4ff58fe6b9436cd487f6e6.tar.xz linux-dev-360e40aedb59799fef4ff58fe6b9436cd487f6e6.zip | |
mtd: h720x-flash: convert to mtd_device_register()
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>
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/maps/h720x-flash.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/mtd/maps/h720x-flash.c b/drivers/mtd/maps/h720x-flash.c index 72c724fa8c27..7f035860a36b 100644 --- a/drivers/mtd/maps/h720x-flash.c +++ b/drivers/mtd/maps/h720x-flash.c @@ -92,18 +92,16 @@ static int __init h720x_mtd_init(void) if (mymtd) { mymtd->owner = THIS_MODULE; -#ifdef CONFIG_MTD_PARTITIONS nr_mtd_parts = parse_mtd_partitions(mymtd, probes, &mtd_parts, 0); if (nr_mtd_parts > 0) part_type = "command line"; -#endif if (nr_mtd_parts <= 0) { mtd_parts = h720x_partitions; nr_mtd_parts = NUM_PARTITIONS; part_type = "builtin"; } 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; } @@ -118,7 +116,7 @@ static void __exit h720x_mtd_cleanup(void) { if (mymtd) { - del_mtd_partitions(mymtd); + mtd_device_unregister(mymtd); map_destroy(mymtd); } |