diff options
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 1594a802631..437fcd2f352 100644 --- a/drivers/mtd/maps/ixp2000.c +++ b/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;  |