summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRicardo Ribalda Delgado <ricardo.ribalda@gmail.com>2015-01-18 12:39:27 +0100
committerLinus Walleij <linus.walleij@linaro.org>2015-01-20 11:18:33 +0100
commit080440a27403c906e8ed67660344fca4b757ed8d (patch)
tree8bac36696f9ddb841c1275db70ab5e7eb00e301f
parentf91b2dbba5fdbe2d211aa8a4b353a8d3b5126f45 (diff)
downloadlinux-080440a27403c906e8ed67660344fca4b757ed8d.tar.bz2
gpio :gpio-mm-lantiq: Use devm_kzalloc
Replace kzalloc with the device managed devm_kzalloc Cc: Alexandre Courbot <gnurou@gmail.com> Cc: John Crispin <blogic@openwrt.org> Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r--drivers/gpio/gpio-mm-lantiq.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/gpio/gpio-mm-lantiq.c b/drivers/gpio/gpio-mm-lantiq.c
index f228b1ce0ce0..789016397c4f 100644
--- a/drivers/gpio/gpio-mm-lantiq.c
+++ b/drivers/gpio/gpio-mm-lantiq.c
@@ -107,14 +107,13 @@ static int ltq_mm_probe(struct platform_device *pdev)
struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
struct ltq_mm *chip;
const __be32 *shadow;
- int ret = 0;
if (!res) {
dev_err(&pdev->dev, "failed to get memory resource\n");
return -ENOENT;
}
- chip = kzalloc(sizeof(*chip), GFP_KERNEL);
+ chip = devm_kzalloc(&pdev->dev, sizeof(*chip), GFP_KERNEL);
if (!chip)
return -ENOMEM;
@@ -129,10 +128,7 @@ static int ltq_mm_probe(struct platform_device *pdev)
if (shadow)
chip->shadow = be32_to_cpu(*shadow);
- ret = of_mm_gpiochip_add(pdev->dev.of_node, &chip->mmchip);
- if (ret)
- kfree(chip);
- return ret;
+ return of_mm_gpiochip_add(pdev->dev.of_node, &chip->mmchip);
}
static const struct of_device_id ltq_mm_match[] = {