From patchwork Mon Feb 1 23:57: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: 576767 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 2B1B5140BCB for ; Tue, 2 Feb 2016 10:57:35 +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=bmaZfiso; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751322AbcBAX5e (ORCPT ); Mon, 1 Feb 2016 18:57:34 -0500 Received: from mail-qg0-f67.google.com ([209.85.192.67]:33692 "EHLO mail-qg0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751087AbcBAX5d (ORCPT ); Mon, 1 Feb 2016 18:57:33 -0500 Received: by mail-qg0-f67.google.com with SMTP id o11so10874219qge.0; Mon, 01 Feb 2016 15:57:33 -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; bh=2+c93tc4NiK7NoyZ6OTObHWwPC96BP6+2jNR440mIpg=; b=bmaZfiso62W3cyHgsABMxYGpqDfucfpkXtVBtbU5k90SDon91ZwCZGKl6vawRs59zB Nq+rZI+74MyBRafRJ3k5H0hecFL0LiJGgOHbw8GOiOAZ/WVix1m3P1NJqTh0AopLvsmC SAscvHXu8LXBY+jtcan8M67sBhjpBQl+80Z99KdmDRLzVbccG8iPU+lT7cmbRwhAYCod +jY+TOXRYZzwBqGf8t0m8VwzIjgupR/oUqyR4JT6rj2vlZdMBfV6GOZS60fGhMPWfXLs DQLyGn1FE4rgdNcIeNgN48Zkm88lZnI1K4f2LZppwwkl4MSOuttiZYu26R9H9E2iOxux USIQ== 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; bh=2+c93tc4NiK7NoyZ6OTObHWwPC96BP6+2jNR440mIpg=; b=PosrpKVGi86RX9M6X0+H3/rDaaIpYw3E1mjD81FxYvq3pVVBgQn7UzWxqEnGGqRIQW i54dl2xHV/SrppGcu1ehtRMWND+WhDII8z7K0T5y2SA3aKkKdUlBnDhk+ef3oUgJe/FA XL6vWV2apS6gHXLQMAo4J4nbwvy2h7pgN3J4ZNkkJqO3mEj4pKS2AEY/c5p42xQeT3r8 w29IYQsdO44y2w7KEqZU2bhx8rTYZ0Y1TMSVDHoB3SLobYa0ug+YT8VBpYuWzUuxR6WM WEHMgoOJtCUV1xq2p5QtFTwDrIgphhDH11aiUOlSu2aiLDo07Gt9mUDb6PvIbHz/WdYL ov/A== X-Gm-Message-State: AG10YORGwdJnxw3nyRBuGH7dnpoMgkPDkIchstS5LBY/0FqiXDq9hzZH/BP0XY6N2ugg/A== X-Received: by 10.140.130.85 with SMTP id 82mr33862660qhc.15.1454371052940; Mon, 01 Feb 2016 15:57:32 -0800 (PST) Received: from localhost (71-47-58-73.res.bhn.net. [71.47.58.73]) by smtp.gmail.com with ESMTPSA id f37sm14444938qkf.6.2016.02.01.15.57.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Feb 2016 15:57:32 -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 7/7] gpio: ws16c48: Use devm_request_region Date: Mon, 1 Feb 2016 18:57:27 -0500 Message-Id: <25faadd8078eb0e4d350c203dad6f544fd96b352.1454342087.git.vilhelm.gray@gmail.com> X-Mailer: git-send-email 2.4.10 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 WinSystems WS16C48 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-ws16c48.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/drivers/gpio/gpio-ws16c48.c b/drivers/gpio/gpio-ws16c48.c index 9dd9479..72b880f 100644 --- a/drivers/gpio/gpio-ws16c48.c +++ b/drivers/gpio/gpio-ws16c48.c @@ -314,11 +314,10 @@ static int __init ws16c48_probe(struct platform_device *pdev) if (!ws16c48gpio) 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; } ws16c48gpio->chip.label = name; @@ -342,7 +341,7 @@ static int __init ws16c48_probe(struct platform_device *pdev) err = gpiochip_add_data(&ws16c48gpio->chip, ws16c48gpio); if (err) { dev_err(dev, "GPIO registering failed (%d)\n", err); - goto err_gpio_register; + return err; } /* Disable IRQ by default */ @@ -356,24 +355,20 @@ static int __init ws16c48_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, ws16c48_irq_handler, IRQF_SHARED, name, ws16c48gpio); 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(&ws16c48gpio->chip); -err_gpio_register: - release_region(base, extent); -err_lock_io_port: return err; } @@ -383,7 +378,6 @@ static int ws16c48_remove(struct platform_device *pdev) free_irq(ws16c48gpio->irq, ws16c48gpio); gpiochip_remove(&ws16c48gpio->chip); - release_region(ws16c48gpio->base, ws16c48gpio->extent); return 0; }