提交 632d8e55 编写于 作者: J Jingoo Han 提交者: Linus Walleij

gpio: mc33880: use devm_kzalloc()

Use devm_kzalloc() to make cleanup paths simpler.
Signed-off-by: NJingoo Han <jg1.han@samsung.com>
Signed-off-by: NLinus Walleij <linus.walleij@linaro.org>
上级 b09638a4
...@@ -101,7 +101,7 @@ static int mc33880_probe(struct spi_device *spi) ...@@ -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) ...@@ -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) ...@@ -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);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册