Skip to content

Commit

Permalink
mtd: gpio: Use devm_kzalloc()
Browse files Browse the repository at this point in the history
devm_kzalloc() is device managed and makes cleanup simpler.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
  • Loading branch information
Sachin Kamat authored and David Woodhouse committed Apr 5, 2013
1 parent c4f8cde commit b60c724
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions drivers/mtd/nand/gpio.c
Original file line number Diff line number Diff line change
Expand Up @@ -259,8 +259,6 @@ static int gpio_nand_remove(struct platform_device *dev)
if (gpio_is_valid(gpiomtd->plat.gpio_rdy))
gpio_free(gpiomtd->plat.gpio_rdy);

kfree(gpiomtd);

return 0;
}

Expand Down Expand Up @@ -297,7 +295,7 @@ static int gpio_nand_probe(struct platform_device *dev)
if (!res0)
return -EINVAL;

gpiomtd = kzalloc(sizeof(*gpiomtd), GFP_KERNEL);
gpiomtd = devm_kzalloc(&dev->dev, sizeof(*gpiomtd), GFP_KERNEL);
if (gpiomtd == NULL) {
dev_err(&dev->dev, "failed to create NAND MTD\n");
return -ENOMEM;
Expand Down Expand Up @@ -412,7 +410,6 @@ static int gpio_nand_probe(struct platform_device *dev)
iounmap(gpiomtd->nand_chip.IO_ADDR_R);
release_mem_region(res0->start, resource_size(res0));
err_map:
kfree(gpiomtd);
return ret;
}

Expand Down

0 comments on commit b60c724

Please sign in to comment.