From patchwork Thu Jun 10 05:40:46 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Grant Likely X-Patchwork-Id: 55148 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from bilbo.ozlabs.org (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id 56865100D90 for ; Thu, 10 Jun 2010 15:41:05 +1000 (EST) Received: from mail-pv0-f179.google.com (mail-pv0-f179.google.com [74.125.83.179]) by ozlabs.org (Postfix) with ESMTP id 1B20B10090A; Thu, 10 Jun 2010 15:40:52 +1000 (EST) Received: by pvg13 with SMTP id 13so1553217pvg.38 for ; Wed, 09 Jun 2010 22:40:51 -0700 (PDT) Received: by 10.115.65.12 with SMTP id s12mr3071403wak.76.1276148451256; Wed, 09 Jun 2010 22:40:51 -0700 (PDT) Received: from angua (S01060002b3d79728.cg.shawcable.net [70.72.87.49]) by mx.google.com with ESMTPS id d16sm73457549wam.0.2010.06.09.22.40.48 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 09 Jun 2010 22:40:49 -0700 (PDT) Received: from [127.0.1.1] (unknown [IPv6:::1]) by angua (Postfix) with ESMTP id EC2523C0110; Wed, 9 Jun 2010 23:40:46 -0600 (MDT) Subject: [PATCH v2 1/5] gpiolib: cosmetic improvements for error handling in gpiochip_add() To: dbrownell@users.sourceforge.net, avorontsov@ru.mvista.com From: Grant Likely Date: Wed, 09 Jun 2010 23:40:46 -0600 Message-ID: <20100610054046.16716.54159.stgit@angua> In-Reply-To: <20100610053439.16716.53944.stgit@angua> References: <20100610053439.16716.53944.stgit@angua> User-Agent: StGit/0.15 MIME-Version: 1.0 Cc: bgat@billgatliff.com, dbaryshkov@gmail.com, devicetree-discuss@lists.ozlabs.org, linux-kernel@vger.kernel.org, akpm@linux-foundation.org, linuxppc-dev@lists.ozlabs.org X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org From: Anton Vorontsov Hopefully it makes the code look nicer and makes it easier to extend this function. Signed-off-by: Anton Vorontsov Signed-off-by: Andrew Morton Signed-off-by: Grant Likely CC: devicetree-discuss@lists.ozlabs.org CC: linux-kernel@vger.kernel.org --- drivers/gpio/gpiolib.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index 3ca3654..713ca0e 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -1101,14 +1101,20 @@ int gpiochip_add(struct gpio_chip *chip) unlock: spin_unlock_irqrestore(&gpio_lock, flags); - if (status == 0) - status = gpiochip_export(chip); + + if (status) + goto fail; + + status = gpiochip_export(chip); + if (status) + goto fail; + + return 0; fail: /* failures here can mean systems won't boot... */ - if (status) - pr_err("gpiochip_add: gpios %d..%d (%s) failed to register\n", - chip->base, chip->base + chip->ngpio - 1, - chip->label ? : "generic"); + pr_err("gpiochip_add: gpios %d..%d (%s) failed to register\n", + chip->base, chip->base + chip->ngpio - 1, + chip->label ? : "generic"); return status; } EXPORT_SYMBOL_GPL(gpiochip_add);