aboutsummaryrefslogtreecommitdiff
path: root/drivers/mtd/maps
diff options
context:
space:
mode:
authorJulia Lawall <Julia.Lawall@lip6.fr>2012-09-01 18:33:11 +0200
committerDavid Woodhouse <David.Woodhouse@intel.com>2012-09-29 15:33:36 +0100
commit6f12f59a5f0dc014209bcc21d5689a6611e1c1e7 (patch)
tree507412bf6739dbf3b09236b5bdac4e5933d41b20 /drivers/mtd/maps
parentfac0077cc0a1760f0afbac6526f56656ee025a34 (diff)
downloadlinaro-lsk-6f12f59a5f0dc014209bcc21d5689a6611e1c1e7.tar.gz
mtd: autcpu12-nvram: drop frees of devm_ alloc'd data
devm free functions should not have to be explicitly used. Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr> Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'drivers/mtd/maps')
-rw-r--r--drivers/mtd/maps/autcpu12-nvram.c18
1 files changed, 4 insertions, 14 deletions
diff --git a/drivers/mtd/maps/autcpu12-nvram.c b/drivers/mtd/maps/autcpu12-nvram.c
index ef420d984d1..76fb594bb1d 100644
--- a/drivers/mtd/maps/autcpu12-nvram.c
+++ b/drivers/mtd/maps/autcpu12-nvram.c
@@ -38,7 +38,6 @@ static int __devinit autcpu12_nvram_probe(struct platform_device *pdev)
map_word tmp, save0, save1;
struct resource *res;
struct autcpu12_nvram_priv *priv;
- int err;
priv = devm_kzalloc(&pdev->dev,
sizeof(struct autcpu12_nvram_priv), GFP_KERNEL);
@@ -50,8 +49,7 @@ static int __devinit autcpu12_nvram_probe(struct platform_device *pdev)
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!res) {
dev_err(&pdev->dev, "failed to get memory resource\n");
- err = -ENOENT;
- goto out;
+ return -ENOENT;
}
priv->map.bankwidth = 4;
@@ -61,8 +59,7 @@ static int __devinit autcpu12_nvram_probe(struct platform_device *pdev)
strcpy((char *)priv->map.name, res->name);
if (!priv->map.virt) {
dev_err(&pdev->dev, "failed to remap mem resource\n");
- err = -EBUSY;
- goto out;
+ return -EBUSY;
}
simple_map_init(&priv->map);
@@ -90,8 +87,7 @@ static int __devinit autcpu12_nvram_probe(struct platform_device *pdev)
priv->mtd = do_map_probe("map_ram", &priv->map);
if (!priv->mtd) {
dev_err(&pdev->dev, "probing failed\n");
- err = -ENXIO;
- goto out;
+ return -ENXIO;
}
priv->mtd->owner = THIS_MODULE;
@@ -106,12 +102,7 @@ static int __devinit autcpu12_nvram_probe(struct platform_device *pdev)
map_destroy(priv->mtd);
dev_err(&pdev->dev, "NV-RAM device addition failed\n");
- err = -ENOMEM;
-
-out:
- devm_kfree(&pdev->dev, priv);
-
- return err;
+ return -ENOMEM;
}
static int __devexit autcpu12_nvram_remove(struct platform_device *pdev)
@@ -120,7 +111,6 @@ static int __devexit autcpu12_nvram_remove(struct platform_device *pdev)
mtd_device_unregister(priv->mtd);
map_destroy(priv->mtd);
- devm_kfree(&pdev->dev, priv);
return 0;
}