diff options
author | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2011-06-02 09:59:46 -0400 |
---|---|---|
committer | Artem Bityutskiy <artem.bityutskiy@intel.com> | 2011-09-11 08:02:06 -0400 |
commit | 200b8777ce270b491affb2bd81192f78f2d46213 (patch) | |
tree | 82d42e6f302fbc898bfda269f53064f407a4252f /drivers/mtd/maps/ixp2000.c | |
parent | ba6bead4469bec8a66f1764106f23890b2a267e2 (diff) |
mtd: ixp2000.c: use mtd_device_parse_register
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>
Diffstat (limited to 'drivers/mtd/maps/ixp2000.c')
-rw-r--r-- | drivers/mtd/maps/ixp2000.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/mtd/maps/ixp2000.c b/drivers/mtd/maps/ixp2000.c index 1594a802631d..437fcd2f352f 100644 --- a/drivers/mtd/maps/ixp2000.c +++ b/drivers/mtd/maps/ixp2000.c | |||
@@ -38,7 +38,6 @@ | |||
38 | struct ixp2000_flash_info { | 38 | struct ixp2000_flash_info { |
39 | struct mtd_info *mtd; | 39 | struct mtd_info *mtd; |
40 | struct map_info map; | 40 | struct map_info map; |
41 | struct mtd_partition *partitions; | ||
42 | struct resource *res; | 41 | struct resource *res; |
43 | }; | 42 | }; |
44 | 43 | ||
@@ -125,8 +124,6 @@ static int ixp2000_flash_remove(struct platform_device *dev) | |||
125 | if (info->map.map_priv_1) | 124 | if (info->map.map_priv_1) |
126 | iounmap((void *) info->map.map_priv_1); | 125 | iounmap((void *) info->map.map_priv_1); |
127 | 126 | ||
128 | kfree(info->partitions); | ||
129 | |||
130 | if (info->res) { | 127 | if (info->res) { |
131 | release_resource(info->res); | 128 | release_resource(info->res); |
132 | kfree(info->res); | 129 | kfree(info->res); |
@@ -229,13 +226,7 @@ static int ixp2000_flash_probe(struct platform_device *dev) | |||
229 | } | 226 | } |
230 | info->mtd->owner = THIS_MODULE; | 227 | info->mtd->owner = THIS_MODULE; |
231 | 228 | ||
232 | err = parse_mtd_partitions(info->mtd, probes, &info->partitions, 0); | 229 | err = mtd_device_parse_register(info->mtd, probes, 0, NULL, 0); |
233 | if (err > 0) { | ||
234 | err = mtd_device_register(info->mtd, info->partitions, err); | ||
235 | if(err) | ||
236 | dev_err(&dev->dev, "Could not parse partitions\n"); | ||
237 | } | ||
238 | |||
239 | if (err) | 230 | if (err) |
240 | goto Error; | 231 | goto Error; |
241 | 232 | ||