From patchwork Wed Feb 3 20:15:21 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: 578338 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 809CB14012C for ; Thu, 4 Feb 2016 07:15:53 +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=gZBix1q9; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932798AbcBCUPw (ORCPT ); Wed, 3 Feb 2016 15:15:52 -0500 Received: from mail-yw0-f196.google.com ([209.85.161.196]:35518 "EHLO mail-yw0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932793AbcBCUPu (ORCPT ); Wed, 3 Feb 2016 15:15:50 -0500 X-Greylist: delayed 70153 seconds by postgrey-1.27 at vger.kernel.org; Wed, 03 Feb 2016 15:15:50 EST Received: by mail-yw0-f196.google.com with SMTP id q190so568613ywd.2; Wed, 03 Feb 2016 12:15:49 -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=5Y73t/X9oE0aAwfqt268zdFd3wtNpMqipc6+xFx1yoY=; b=gZBix1q9jgM1iN+6GRDzRhCeMfdTW9rHyhb5vuWa2ECphG+avGlcG/wWhNRnAdP3j4 Mx3kSrqG/eQR59X/zqovyqIehxZoNHvW2sdzLFJ4+J1yUwZnWfWWUuscWY+z8SVBOqu9 iG0nPjqABuOVdiL1s4JfaT5JRrSTv7LfjIoZw4aWKQhFXjMB9jwYDYJJMtXpskqrREy1 /w358tQdL8ZxsXHVFwr6MbCdu/HSSmVqBiyDB2xyht73XhQ3up9aXo+zz7IcIXpkas8t VlBUS1VnlsL1wBnJfYeMxEn5TtAV++E6nRmIlT0vILha6UW432hEpYNarv8bXU8JeOcw Y90Q== 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=5Y73t/X9oE0aAwfqt268zdFd3wtNpMqipc6+xFx1yoY=; b=Uju29uQYzmrPgn91oHpf+Md5t2gU6YTEqphVikRgXKz8YmcG6mvKr21yzIYPuUePRV sLEoVpTURT3Za9zliOkY8QxwH4mQlSmxWf4bPJm2jEISxnLiAR/h8FD23MLP8m5wAwMo vyjxHFHW/PKfTN5jUlCbxccO+e6ivD4Z0D1xzOg9c4tTI5W9l4I6ypXRcvTJC1lGi5gz T5MDRsox5pHsCArsu+NpBf8/vdbYaKvbhu5JY3jm73qvkcumrN2wq4jtvcmETBqPhYIq fh0e++EeM1yRtj9DFaw14IHtmRjKAKUf5S8Vrpym23R/e4YbhwL+eubkTZ3SiR5orZgo 9uoQ== X-Gm-Message-State: AG10YOQ0BcSOy32fGNMPak+um5QK6n2J3viU0Ud/5SqjdnBJ3ZGg8pCqOSyNxr7RGjbOug== X-Received: by 10.13.223.76 with SMTP id i73mr2065511ywe.20.1454530549584; Wed, 03 Feb 2016 12:15:49 -0800 (PST) Received: from localhost (71-47-58-73.res.bhn.net. [71.47.58.73]) by smtp.gmail.com with ESMTPSA id w139sm4399567ywa.44.2016.02.03.12.15.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Feb 2016 12:15:49 -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 1/7] gpio: 104-dio-48e: Use devm_request_region Date: Wed, 3 Feb 2016 15:15:21 -0500 Message-Id: <98d3cf3c17e833e825f4a58d442339995fca8379.1454530144.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-DIO-48E 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-dio-48e.c | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/drivers/gpio/gpio-104-dio-48e.c b/drivers/gpio/gpio-104-dio-48e.c index 279de39..b144bc9 100644 --- a/drivers/gpio/gpio-104-dio-48e.c +++ b/drivers/gpio/gpio-104-dio-48e.c @@ -40,7 +40,6 @@ MODULE_PARM_DESC(dio_48e_irq, "ACCES 104-DIO-48E interrupt line number"); * @control: Control registers state * @lock: synchronization lock to prevent I/O race conditions * @base: base port address of the GPIO device - * @extent: extent of port address region of the GPIO device * @irq: Interrupt line number * @irq_mask: I/O bits affected by interrupts */ @@ -51,7 +50,6 @@ struct dio48e_gpio { unsigned char control[2]; spinlock_t lock; unsigned base; - unsigned extent; unsigned irq; unsigned char irq_mask; }; @@ -310,11 +308,10 @@ static int __init dio48e_probe(struct platform_device *pdev) if (!dio48egpio) 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; } dio48egpio->chip.label = name; @@ -328,7 +325,6 @@ static int __init dio48e_probe(struct platform_device *pdev) dio48egpio->chip.get = dio48e_gpio_get; dio48egpio->chip.set = dio48e_gpio_set; dio48egpio->base = base; - dio48egpio->extent = extent; dio48egpio->irq = irq; spin_lock_init(&dio48egpio->lock); @@ -338,7 +334,7 @@ static int __init dio48e_probe(struct platform_device *pdev) err = gpiochip_add_data(&dio48egpio->chip, dio48egpio); if (err) { dev_err(dev, "GPIO registering failed (%d)\n", err); - goto err_gpio_register; + return err; } /* initialize all GPIO as output */ @@ -360,23 +356,19 @@ static int __init dio48e_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, dio48e_irq_handler, 0, name, dio48egpio); 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(&dio48egpio->chip); -err_gpio_register: - release_region(base, extent); -err_lock_io_port: return err; } @@ -386,7 +378,6 @@ static int dio48e_remove(struct platform_device *pdev) free_irq(dio48egpio->irq, dio48egpio); gpiochip_remove(&dio48egpio->chip); - release_region(dio48egpio->base, dio48egpio->extent); return 0; }