diff options
| author | Sachin Kamat <sachin.kamat@linaro.org> | 2013-03-14 15:37:02 +0530 | 
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2013-04-05 13:20:05 +0100 | 
| commit | b60c7243863fd2a5059d2c3137ed31b797cd7848 (patch) | |
| tree | 695560a103bf837d7cb0afe5aba86b4f896214be | |
| parent | c4f8cde8343ace075fb3dae2d5bc796cdfaffbfd (diff) | |
| download | olio-linux-3.10-b60c7243863fd2a5059d2c3137ed31b797cd7848.tar.xz olio-linux-3.10-b60c7243863fd2a5059d2c3137ed31b797cd7848.zip  | |
mtd: gpio: Use devm_kzalloc()
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>
| -rw-r--r-- | drivers/mtd/nand/gpio.c | 5 | 
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/mtd/nand/gpio.c b/drivers/mtd/nand/gpio.c index e789e3f5171..0cc1394cbeb 100644 --- a/drivers/mtd/nand/gpio.c +++ b/drivers/mtd/nand/gpio.c @@ -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;  } @@ -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; @@ -412,7 +410,6 @@ err_sync:  	iounmap(gpiomtd->nand_chip.IO_ADDR_R);  	release_mem_region(res0->start, resource_size(res0));  err_map: -	kfree(gpiomtd);  	return ret;  }  |