From c07478ee6918297643ab187ce26c50e5b433a1e5 Mon Sep 17 00:00:00 2001 From: Dmitry Eremin-Solenikov Date: Thu, 2 Jun 2011 17:59:46 +0400 Subject: [PATCH] --- yaml --- r: 274827 b: refs/heads/master c: 200b8777ce270b491affb2bd81192f78f2d46213 h: refs/heads/master i: 274825: 85ef9f54091b9ad0146063ccb635622b39bce027 274823: 4b2d9728d8269d43b123c7083cb96c9756c9f53c v: v3 --- [refs] | 2 +- trunk/drivers/mtd/maps/ixp2000.c | 11 +---------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 9f5bece5e91d..e10d823f8331 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ba6bead4469bec8a66f1764106f23890b2a267e2 +refs/heads/master: 200b8777ce270b491affb2bd81192f78f2d46213 diff --git a/trunk/drivers/mtd/maps/ixp2000.c b/trunk/drivers/mtd/maps/ixp2000.c index 1594a802631d..437fcd2f352f 100644 --- a/trunk/drivers/mtd/maps/ixp2000.c +++ b/trunk/drivers/mtd/maps/ixp2000.c @@ -38,7 +38,6 @@ struct ixp2000_flash_info { struct mtd_info *mtd; struct map_info map; - struct mtd_partition *partitions; struct resource *res; }; @@ -125,8 +124,6 @@ static int ixp2000_flash_remove(struct platform_device *dev) if (info->map.map_priv_1) iounmap((void *) info->map.map_priv_1); - kfree(info->partitions); - if (info->res) { release_resource(info->res); kfree(info->res); @@ -229,13 +226,7 @@ static int ixp2000_flash_probe(struct platform_device *dev) } info->mtd->owner = THIS_MODULE; - err = parse_mtd_partitions(info->mtd, probes, &info->partitions, 0); - if (err > 0) { - err = mtd_device_register(info->mtd, info->partitions, err); - if(err) - dev_err(&dev->dev, "Could not parse partitions\n"); - } - + err = mtd_device_parse_register(info->mtd, probes, 0, NULL, 0); if (err) goto Error;