Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932474AbbHXMFI (ORCPT ); Mon, 24 Aug 2015 08:05:08 -0400 Received: from mail-pd0-f173.google.com ([209.85.192.173]:36311 "EHLO mail-pd0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752987AbbHXMFG (ORCPT ); Mon, 24 Aug 2015 08:05:06 -0400 From: Peng Fan To: linus.walleij@linaro.org, gnurou@gmail.com Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, van.freenix@gmail.com Subject: [PATCH] gpio: gpiolib: use devm_* API to simplify driver code Date: Mon, 24 Aug 2015 20:05:30 +0800 Message-Id: <1440417930-15876-1-git-send-email-van.freenix@gmail.com> X-Mailer: git-send-email 1.8.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1789 Lines: 60 Use devm_* API to simplify driver code. Signed-off-by: Peng Fan Cc: Linus Walleij Cc: Alexandre Courbot --- drivers/gpio/gpiolib.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index 6bc612b..f9470b0 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -243,7 +243,8 @@ int gpiochip_add(struct gpio_chip *chip) int base = chip->base; struct gpio_desc *descs; - descs = kcalloc(chip->ngpio, sizeof(descs[0]), GFP_KERNEL); + descs = devm_kcalloc(chip->dev, chip->ngpio, sizeof(descs[0]), + GFP_KERNEL); if (!descs) return -ENOMEM; @@ -254,7 +255,7 @@ int gpiochip_add(struct gpio_chip *chip) if (base < 0) { status = base; spin_unlock_irqrestore(&gpio_lock, flags); - goto err_free_descs; + goto err_descs; } chip->base = base; } @@ -262,7 +263,7 @@ int gpiochip_add(struct gpio_chip *chip) status = gpiochip_add_to_list(chip); if (status) { spin_unlock_irqrestore(&gpio_lock, flags); - goto err_free_descs; + goto err_descs; } for (id = 0; id < chip->ngpio; id++) { @@ -308,9 +309,7 @@ err_remove_chip: list_del(&chip->list); spin_unlock_irqrestore(&gpio_lock, flags); chip->desc = NULL; -err_free_descs: - kfree(descs); - +err_descs: /* failures here can mean systems won't boot... */ pr_err("%s: GPIOs %d..%d (%s) failed to register\n", __func__, chip->base, chip->base + chip->ngpio - 1, -- 1.8.4.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/