Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-09 15:29:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mtd: autcpu12-nvram: drop frees of devm_ alloc'd data

Browse Source 
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>
This commit is contained in:
Julia Lawall 2012-09-01 18:33:11 +02:00 committed by David Woodhouse
parent fac0077cc0
commit 6f12f59a5f
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/mtd/maps/autcpu12-nvram.c
View File

@ -38,7 +38,6 @@ static int __devinit autcpu12_nvram_probe(struct platform_device *pdev)
map_word tmp, save0, save1; map_word tmp, save0, save1;
struct resource *res; struct resource *res;
struct autcpu12_nvram_priv *priv; struct autcpu12_nvram_priv *priv;
int err;
priv = devm_kzalloc(&pdev->dev, priv = devm_kzalloc(&pdev->dev,
sizeof(struct autcpu12_nvram_priv), GFP_KERNEL); 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); res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!res) { if (!res) {
dev_err(&pdev->dev, "failed to get memory resource\n"); dev_err(&pdev->dev, "failed to get memory resource\n");
err = -ENOENT; return -ENOENT;
goto out;
} }
priv->map.bankwidth = 4; 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); strcpy((char *)priv->map.name, res->name);
if (!priv->map.virt) { if (!priv->map.virt) {
dev_err(&pdev->dev, "failed to remap mem resource\n"); dev_err(&pdev->dev, "failed to remap mem resource\n");
err = -EBUSY; return -EBUSY;
goto out;
} }
simple_map_init(&priv->map); 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); priv->mtd = do_map_probe("map_ram", &priv->map);
if (!priv->mtd) { if (!priv->mtd) {
dev_err(&pdev->dev, "probing failed\n"); dev_err(&pdev->dev, "probing failed\n");
err = -ENXIO; return -ENXIO;
goto out;
} }
priv->mtd->owner = THIS_MODULE; priv->mtd->owner = THIS_MODULE;
@ -106,12 +102,7 @@ static int __devinit autcpu12_nvram_probe(struct platform_device *pdev)
map_destroy(priv->mtd); map_destroy(priv->mtd);
dev_err(&pdev->dev, "NV-RAM device addition failed\n"); dev_err(&pdev->dev, "NV-RAM device addition failed\n");
err = -ENOMEM; return -ENOMEM;
out:
devm_kfree(&pdev->dev, priv);
return err;
} }
static int __devexit autcpu12_nvram_remove(struct platform_device *pdev) 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); mtd_device_unregister(priv->mtd);
map_destroy(priv->mtd); map_destroy(priv->mtd);
devm_kfree(&pdev->dev, priv);
return 0; return 0;
} }