UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

gpio: mc33880: use devm_kzalloc() 

Use devm_kzalloc() to make cleanup paths simpler.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Jingoo Han 2013-03-15 18:15:49 +09:00 committed by Linus Walleij
parent b09638a4d6
commit 632d8e55d1
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/gpio/gpio-mc33880.c
View File

@ -101,7 +101,7 @@ static int mc33880_probe(struct spi_device *spi)
if (ret < 0) if (ret < 0)
return ret; return ret;
mc = kzalloc(sizeof(struct mc33880), GFP_KERNEL); mc = devm_kzalloc(&spi->dev, sizeof(struct mc33880), GFP_KERNEL);
if (!mc) if (!mc)
return -ENOMEM; return -ENOMEM;
@ -143,7 +143,6 @@ static int mc33880_probe(struct spi_device *spi)
exit_destroy: exit_destroy:
dev_set_drvdata(&spi->dev, NULL); dev_set_drvdata(&spi->dev, NULL);
mutex_destroy(&mc->lock); mutex_destroy(&mc->lock);
kfree(mc);
return ret; return ret;
} }
@ -159,10 +158,9 @@ static int mc33880_remove(struct spi_device *spi)
dev_set_drvdata(&spi->dev, NULL); dev_set_drvdata(&spi->dev, NULL);
ret = gpiochip_remove(&mc->chip); ret = gpiochip_remove(&mc->chip);
if (!ret) { if (!ret)
mutex_destroy(&mc->lock); mutex_destroy(&mc->lock);
kfree(mc); else
} else
dev_err(&spi->dev, "Failed to remove the GPIO controller: %d\n", dev_err(&spi->dev, "Failed to remove the GPIO controller: %d\n",
ret); ret);