From patchwork Wed Feb 3 20:17:02 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: 578341 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 88D0914012C for ; Thu, 4 Feb 2016 07:17:12 +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=Vds9CB2E; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933000AbcBCURL (ORCPT ); Wed, 3 Feb 2016 15:17:11 -0500 Received: from mail-yw0-f193.google.com ([209.85.161.193]:35585 "EHLO mail-yw0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932999AbcBCURJ (ORCPT ); Wed, 3 Feb 2016 15:17:09 -0500 Received: by mail-yw0-f193.google.com with SMTP id q190so569022ywd.2; Wed, 03 Feb 2016 12:17:09 -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=BRUEifO5cbkdRRvIpeeHspa403pm+3HRAu2+sZglWGs=; b=Vds9CB2Ej8ktX77sNhzsFaSSQmUozHMCV9lM4k8IGKwFgz2WcD5zqZqIaqZgcniqlV GwFbbDCeoHQ6Z2xNQAyAvFQd5mQVPyVxwiJNT9v8T2xITRvYpxhGKqmvuA4BVZsuUXQb UOUeKIim4JbZiTdzkK8bPymIS0aTjh3QjMTnfCFAdQXa+M70AAWsczwFZBpwXM4flyDY w+YCN3RAt5L1EfNfQMCIUVpyAzQQtlE9imHVRvWzveQeiTjKY4VBDEPAAkUrRmVMYBHF C0Ef951Lnof+PonmMHGdtkKJoQuF+N4ekI+uFEDL1R3f7zWTkgf+5X4omIh2y6x0W/eZ cR3Q== 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=BRUEifO5cbkdRRvIpeeHspa403pm+3HRAu2+sZglWGs=; b=LlR8YUPb2k82tdpU9zakNWIo0BZD4hCJS5Qyqeelu6CBX+bcLzcRguKrwdHmArYQ3P r52xT5s1tOp9et0zlWkpYk5f0VVg15yXrEcIaSqkB9BZX5aNWK79fZVB62HCwLB2cV5R X/4NeQ56zdwqFi2yKGQF73zVY6m/e7hR+UcQOVMz8/M44dMLGbkQJWAKxzrHPNaTgbr8 92lTQlteBXmoOf9OqPaW5O9ccYg8+PNnJdAcEYx8g4CUWYLIjOtGFJFIyDrXbRc+qsUm LzaEZspnrQnzRN3+fh6WOD+BnYmmqGCmlCZZ8YfsyR6rvhRRrOa05E39Tl3DFDOzPgbh iM+g== X-Gm-Message-State: AG10YOSrZ2zH1/TkykA0m0ccrz/ZO3dHpEami6IdcXvSfmlnZ++q5cVTltdgwp1FV49WeA== X-Received: by 10.129.133.2 with SMTP id v2mr2011076ywf.240.1454530628822; Wed, 03 Feb 2016 12:17:08 -0800 (PST) Received: from localhost (71-47-58-73.res.bhn.net. [71.47.58.73]) by smtp.gmail.com with ESMTPSA id k186sm4402603ywf.14.2016.02.03.12.17.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Feb 2016 12:17:08 -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 v2 3/7] gpio: 104-idio-16: Use devm_request_region Date: Wed, 3 Feb 2016 15:17:02 -0500 Message-Id: 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 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 Reviewed-by: Alexandre Courbot --- drivers/gpio/gpio-104-idio-16.c | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/drivers/gpio/gpio-104-idio-16.c b/drivers/gpio/gpio-104-idio-16.c index 4d69b50..e7f881f 100644 --- a/drivers/gpio/gpio-104-idio-16.c +++ b/drivers/gpio/gpio-104-idio-16.c @@ -38,7 +38,6 @@ MODULE_PARM_DESC(idio_16_irq, "ACCES 104-IDIO-16 interrupt line number"); * @lock: synchronization lock to prevent I/O race conditions * @irq_mask: I/O bits affected by interrupts * @base: base port address of the GPIO device - * @extent: extent of port address region of the GPIO device * @irq: Interrupt line number * @out_state: output bits state */ @@ -47,7 +46,6 @@ struct idio_16_gpio { spinlock_t lock; unsigned long irq_mask; unsigned base; - unsigned extent; unsigned irq; unsigned out_state; }; @@ -201,11 +199,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; @@ -219,7 +216,6 @@ static int __init idio_16_probe(struct platform_device *pdev) idio16gpio->chip.get = idio_16_gpio_get; idio16gpio->chip.set = idio_16_gpio_set; idio16gpio->base = base; - idio16gpio->extent = extent; idio16gpio->irq = irq; idio16gpio->out_state = 0xFFFF; @@ -230,7 +226,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 +237,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 +259,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; }