[PATCH 2/8] gpio/-mm-lantiq: Use devm_kzalloc

From: Ricardo Ribalda Delgado
Date: Sun Jan 18 2015 - 06:40:37 EST


Replace kzalloc with the device managed devm_kzalloc

Cc: Linus Walleij <linus.walleij@xxxxxxxxxx>
Cc: Alexandre Courbot <gnurou@xxxxxxxxx>
Cc: John Crispin <blogic@xxxxxxxxxxx>
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@xxxxxxxxx>
---
drivers/gpio/gpio-mm-lantiq.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/drivers/gpio/gpio-mm-lantiq.c b/drivers/gpio/gpio-mm-lantiq.c
index f228b1c..7890163 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[] = {
--
2.1.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/