diff options
author | Ezequiel Garcia <ezequiel.garcia@free-electrons.com> | 2013-04-17 13:38:09 -0300 |
---|---|---|
committer | David Woodhouse <David.Woodhouse@intel.com> | 2013-08-05 20:47:23 +0100 |
commit | 4c073cd26e0835ae9c807a6188272e09d3087d85 (patch) | |
tree | b6f80c90528ccfd7e48b6d8e81b8b3d88328d033 /drivers/mtd/nand/pxa3xx_nand.c | |
parent | a1c06609b37c304c58f6d1d3b8e987edaf3391f3 (diff) |
mtd: nand: pxa3xx: Use devm_kzalloc
Replace regular kzalloc with managed devm_kzalloc
which simplifies the error path.
Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'drivers/mtd/nand/pxa3xx_nand.c')
-rw-r--r-- | drivers/mtd/nand/pxa3xx_nand.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c index dec80ca6a5ce..873eba56ff60 100644 --- a/drivers/mtd/nand/pxa3xx_nand.c +++ b/drivers/mtd/nand/pxa3xx_nand.c @@ -1035,12 +1035,10 @@ static int alloc_nand_resource(struct platform_device *pdev) int ret, irq, cs; pdata = pdev->dev.platform_data; - info = kzalloc(sizeof(*info) + (sizeof(*mtd) + - sizeof(*host)) * pdata->num_cs, GFP_KERNEL); - if (!info) { - dev_err(&pdev->dev, "failed to allocate memory\n"); + info = devm_kzalloc(&pdev->dev, sizeof(*info) + (sizeof(*mtd) + + sizeof(*host)) * pdata->num_cs, GFP_KERNEL); + if (!info) return -ENOMEM; - } info->pdev = pdev; for (cs = 0; cs < pdata->num_cs; cs++) { @@ -1072,8 +1070,7 @@ static int alloc_nand_resource(struct platform_device *pdev) info->clk = clk_get(&pdev->dev, NULL); if (IS_ERR(info->clk)) { dev_err(&pdev->dev, "failed to get nand clock\n"); - ret = PTR_ERR(info->clk); - goto fail_free_mtd; + return PTR_ERR(info->clk); } clk_enable(info->clk); @@ -1165,8 +1162,6 @@ fail_free_res: fail_put_clk: clk_disable(info->clk); clk_put(info->clk); -fail_free_mtd: - kfree(info); return ret; } @@ -1202,7 +1197,6 @@ static int pxa3xx_nand_remove(struct platform_device *pdev) for (cs = 0; cs < pdata->num_cs; cs++) nand_release(info->host[cs]->mtd); - kfree(info); return 0; } |