From patchwork Mon Feb 1 23:54:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William Breathitt Gray X-Patchwork-Id: 576762 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id ACAA314033B for ; Tue, 2 Feb 2016 10:55:52 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=mlo/EQUw; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751925AbcBAXzJ (ORCPT ); Mon, 1 Feb 2016 18:55:09 -0500 Received: from mail-yk0-f195.google.com ([209.85.160.195]:33547 "EHLO mail-yk0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751533AbcBAXzG (ORCPT ); Mon, 1 Feb 2016 18:55:06 -0500 Received: by mail-yk0-f195.google.com with SMTP id r207so1118766ykd.0; Mon, 01 Feb 2016 15:55:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=Qmvi8eg/edDw3+YIlEdZ3ppA82Khr/hAAW1CLB7Oh/4=; b=mlo/EQUw7dq0fM20qvHgywVVeG1PQX35P26+eEfsGDgqLxm8FR/8IoZ/bEig7+ES62 CGiRGIti4bj/bR0OtaBSqPrUI7B/rdKafMMrM0miOjWRkB2mZ8736XcOr6D+HJ7ZLHnN GaMxWrpYyDNeYpgBvwNA91mLRvgaxnvzuFA/3YSxeHNN1D3dIGySjZ4HDftgqchxVjNt y3wZkKbecHqSACzyKcaM9O/7+O4dg2m55l2PshuplH2qXSkaHF9vL9VX2rJvIyAqluk/ tXpuiMOlbWdDFzhvSziCx15ZmfbssCaIV226sYMWTPNROZ93Z6HAp9LUn2mQEMgFHLZS 4N8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=Qmvi8eg/edDw3+YIlEdZ3ppA82Khr/hAAW1CLB7Oh/4=; b=LH64J8SUOfCarKqnojl63suVAgwCDsGCyDhILrEU8xNLVA5QgryqhYj2frvn57fpAF PEDlJCovXe1q45ZFa/NPr+CRSIu4hoxqf8ZPtotU4nf5kyr3oPac/DKtcCiPJDSf/n5g svUwCqX+KdNyZVehu/clNvm1ZCqxuNmktQkNPrZaR1sJXa5fhr+gGw1Ql2QzgMpAmcUp XJQm+2kLDxJDHgAgmanIRjHIj2RNzf4xdBfAlpdHAiPwuG3RKAmVTcBc6yH0uqnxjnYs EwhV2cS7NesXnmqDxS4UoppBRdXX6Z8hZ3OCIBVPMPamBmoo0M4nSXyBI4ftKIW4hTE9 c60w== X-Gm-Message-State: AG10YOSh0XsGjIuizuBGF8uRqwOsy12kUEkTuc7akdn0pg1J3du1Wgsyt+NCVKKJN7nwFw== X-Received: by 10.37.231.202 with SMTP id e193mr1999965ybh.146.1454370905602; Mon, 01 Feb 2016 15:55:05 -0800 (PST) Received: from localhost (71-47-58-73.res.bhn.net. [71.47.58.73]) by smtp.gmail.com with ESMTPSA id i17sm13739795ywc.49.2016.02.01.15.55.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Feb 2016 15:55:05 -0800 (PST) From: William Breathitt Gray To: linus.walleij@linaro.org, gnurou@gmail.com Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/7] gpio: 104-idio-16: Use devm_request_region Date: Mon, 1 Feb 2016 18:54:28 -0500 Message-Id: <13ff690ef1cd7e11066582c1d0611602fab66c02.1454342087.git.vilhelm.gray@gmail.com> X-Mailer: git-send-email 2.4.10 In-Reply-To: References: In-Reply-To: References: Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org By the time request_region is called in the ACCES 104-IDIO-16 GPIO driver, a corresponding device structure has already been allocated. The devm_request_region function should be used to help simplify the cleanup code and reduce the possible points of failure. Signed-off-by: William Breathitt Gray --- drivers/gpio/gpio-104-idio-16.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/drivers/gpio/gpio-104-idio-16.c b/drivers/gpio/gpio-104-idio-16.c index 4d69b50..aecdc02 100644 --- a/drivers/gpio/gpio-104-idio-16.c +++ b/drivers/gpio/gpio-104-idio-16.c @@ -201,11 +201,10 @@ static int __init idio_16_probe(struct platform_device *pdev) if (!idio16gpio) return -ENOMEM; - if (!request_region(base, extent, name)) { - dev_err(dev, "Unable to lock %s port addresses (0x%X-0x%X)\n", - name, base, base + extent); - err = -EBUSY; - goto err_lock_io_port; + if (!devm_request_region(dev, base, extent, name)) { + dev_err(dev, "Unable to lock port addresses (0x%X-0x%X)\n", + base, base + extent); + return -EBUSY; } idio16gpio->chip.label = name; @@ -230,7 +229,7 @@ static int __init idio_16_probe(struct platform_device *pdev) err = gpiochip_add_data(&idio16gpio->chip, idio16gpio); if (err) { dev_err(dev, "GPIO registering failed (%d)\n", err); - goto err_gpio_register; + return err; } /* Disable IRQ by default */ @@ -241,23 +240,19 @@ static int __init idio_16_probe(struct platform_device *pdev) handle_edge_irq, IRQ_TYPE_NONE); if (err) { dev_err(dev, "Could not add irqchip (%d)\n", err); - goto err_gpiochip_irqchip_add; + goto err_gpiochip_remove; } err = request_irq(irq, idio_16_irq_handler, 0, name, idio16gpio); if (err) { dev_err(dev, "IRQ handler registering failed (%d)\n", err); - goto err_request_irq; + goto err_gpiochip_remove; } return 0; -err_request_irq: -err_gpiochip_irqchip_add: +err_gpiochip_remove: gpiochip_remove(&idio16gpio->chip); -err_gpio_register: - release_region(base, extent); -err_lock_io_port: return err; } @@ -267,7 +262,6 @@ static int idio_16_remove(struct platform_device *pdev) free_irq(idio16gpio->irq, idio16gpio); gpiochip_remove(&idio16gpio->chip); - release_region(idio16gpio->base, idio16gpio->extent); return 0; }