From patchwork Mon Feb 1 23:54:27 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: 576763 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 6706C14033B for ; Tue, 2 Feb 2016 10:55:56 +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=IFz0m/HI; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751784AbcBAXyz (ORCPT ); Mon, 1 Feb 2016 18:54:55 -0500 Received: from mail-qk0-f194.google.com ([209.85.220.194]:34468 "EHLO mail-qk0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752263AbcBAXyx (ORCPT ); Mon, 1 Feb 2016 18:54:53 -0500 Received: by mail-qk0-f194.google.com with SMTP id u128so4819449qkh.1; Mon, 01 Feb 2016 15:54:53 -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=peavoaYIFueToXzq5OFPynjWT7EFZUgZJuyCjLtFu+g=; b=IFz0m/HIWi+zfyCeQPkZ0Di6mgNTOtYT0bTaO1l42FW1x0gXEESyY9BKPgwX0jwTzl 8/moiKVCO9oI2ncC5EGgJFozGrz4KL2UPSQOXaHFX86gB4C2OHGfWvn7opSU1QJCc4VR Gg2Hlix6f0E2K0ZbiWcdoRxk89lQbJkFcWUdAmtsr7bAebR/GwgE5R8Rn+tsPF6Adrgg GO0xb3CsfD1/h/MBsTEKFeMd0lJ1cGLGz4XfiBrvTRuoIsYP+y3basw53Mi5TpLYDeTt 0jBwsbLnzyx2cc/jkMG4aneKme31o4Dtar5H92mIpVi+J3g6SWWc4rQcnzxopnRnUWVa xlbw== 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=peavoaYIFueToXzq5OFPynjWT7EFZUgZJuyCjLtFu+g=; b=mmLXlmhe+4JZX04LEMt+hn9OmFdEaoVOp8ekbfLWyHh8hl8enmmx6AmyX0eHz2UjKb StJEAGrBhCl7UJ0XTmcoG7VwQT4AoWjivj2ddTRyjyBiw3OoLSKeqwNnbcfjheTTuXIZ jaN+0Q5++ZYp9UBeVXXyUjCcGdiv+1Tb/Dyo2Vr3vIJbd8F8WOEHqiUCehrna+W1uEM4 obEtiGS4lZi3F70mMH+aZAL3nrUht2JoEok6LVSnCaYPNKvzz+KUPEpZmbymLq1JDdTd XE1mkZkOTab8C7YrM1az0ei0Vl94PThFweDPb/KASFqz4NzQ/jUXv7ZhjTYI94glDWP0 mpyw== X-Gm-Message-State: AG10YOQGzAH2c0ak+OGgTmoW1tBMV1wcCZo5IeggXPfdcgmk/5jpCXF156rxYaIE34sBJA== X-Received: by 10.55.212.152 with SMTP id s24mr32091022qks.36.1454370892689; Mon, 01 Feb 2016 15:54:52 -0800 (PST) Received: from localhost (71-47-58-73.res.bhn.net. [71.47.58.73]) by smtp.gmail.com with ESMTPSA id j23sm15216262qge.23.2016.02.01.15.54.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Feb 2016 15:54:52 -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 2/7] gpio: 104-idi-48: Use devm_request_region Date: Mon, 1 Feb 2016 18:54:27 -0500 Message-Id: <5cf902e0d9b394c20cbf9ad4ec226eb928d2f67f.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-IDI-48 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-idi-48.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/drivers/gpio/gpio-104-idi-48.c b/drivers/gpio/gpio-104-idi-48.c index 285a075..70359f7 100644 --- a/drivers/gpio/gpio-104-idi-48.c +++ b/drivers/gpio/gpio-104-idi-48.c @@ -227,11 +227,10 @@ static int __init idi_48_probe(struct platform_device *pdev) if (!idi48gpio) 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; } idi48gpio->chip.label = name; @@ -253,7 +252,7 @@ static int __init idi_48_probe(struct platform_device *pdev) err = gpiochip_add_data(&idi48gpio->chip, idi48gpio); if (err) { dev_err(dev, "GPIO registering failed (%d)\n", err); - goto err_gpio_register; + return err; } /* Disable IRQ by default */ @@ -264,24 +263,20 @@ static int __init idi_48_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, idi_48_irq_handler, IRQF_SHARED, name, idi48gpio); 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(&idi48gpio->chip); -err_gpio_register: - release_region(base, extent); -err_lock_io_port: return err; } @@ -291,7 +286,6 @@ static int idi_48_remove(struct platform_device *pdev) free_irq(idi48gpio->irq, idi48gpio); gpiochip_remove(&idi48gpio->chip); - release_region(idi48gpio->base, idi48gpio->extent); return 0; }