From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1764144AbcINS4S (ORCPT ); Wed, 14 Sep 2016 14:56:18 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:36399 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1763319AbcINS4J (ORCPT ); Wed, 14 Sep 2016 14:56:09 -0400 From: Heiner Kallweit Subject: [PATCH v2 7/7] leds: gpio: fix and simplify error handling in gpio_leds_create To: Jacek Anaszewski References: <5432fb03-ea18-a949-ce53-10fedc15f5d9@gmail.com> Cc: "linux-leds@vger.kernel.org" , Linux Kernel Mailing List Message-ID: <7597b0ad-f0a0-bfbf-8d46-c5b968b1101c@gmail.com> Date: Wed, 14 Sep 2016 20:55:43 +0200 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.2.0 MIME-Version: 1.0 In-Reply-To: <5432fb03-ea18-a949-ce53-10fedc15f5d9@gmail.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Simplify the error handling and add a missing call to fwnode_handle_put when checking led.name. Signed-off-by: Heiner Kallweit --- v2: - rebased due to removal of patch 2 of the original series --- drivers/leds/leds-gpio.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/drivers/leds/leds-gpio.c b/drivers/leds/leds-gpio.c index ab273f8..d400dca 100644 --- a/drivers/leds/leds-gpio.c +++ b/drivers/leds/leds-gpio.c @@ -177,16 +177,15 @@ static struct gpio_leds_priv *gpio_leds_create(struct platform_device *pdev) led.gpiod = devm_get_gpiod_from_child(dev, NULL, child); if (IS_ERR(led.gpiod)) { fwnode_handle_put(child); - ret = PTR_ERR(led.gpiod); - goto err; + return ERR_CAST(led.gpiod); } ret = fwnode_property_read_string(child, "label", &led.name); if (ret && IS_ENABLED(CONFIG_OF) && np) led.name = np->name; if (!led.name) { - ret = -EINVAL; - goto err; + fwnode_handle_put(child); + return ERR_PTR(-EINVAL); } fwnode_property_read_string(child, "linux,default-trigger", @@ -210,16 +209,13 @@ static struct gpio_leds_priv *gpio_leds_create(struct platform_device *pdev) ret = create_gpio_led(&led, led_dat, dev, NULL); if (ret < 0) { fwnode_handle_put(child); - goto err; + return ERR_PTR(ret); } led_dat->cdev.dev->of_node = np; priv->num_leds++; } return priv; - -err: - return ERR_PTR(ret); } static const struct of_device_id of_gpio_leds_match[] = { -- 2.9.2