From patchwork Sat Mar 4 16:23:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 735303 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 3vbBRf1mCfz9s8H for ; Sun, 5 Mar 2017 03:32:46 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=baylibre-com.20150623.gappssmtp.com header.i=@baylibre-com.20150623.gappssmtp.com header.b="gep4wV6v"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752290AbdCDQcp (ORCPT ); Sat, 4 Mar 2017 11:32:45 -0500 Received: from mail-wr0-f175.google.com ([209.85.128.175]:35694 "EHLO mail-wr0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752455AbdCDQcH (ORCPT ); Sat, 4 Mar 2017 11:32:07 -0500 Received: by mail-wr0-f175.google.com with SMTP id g10so91298125wrg.2 for ; Sat, 04 Mar 2017 08:32:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=OVxGkgPM+ULrfKEiuscHC3BiYteIEz9BtWpLpXUfLu0=; b=gep4wV6vqs1GH766nqoi4fUn3PEYcEdERlGun3D/BWqF+CnvRJLySBPpOxAAeaaQHP e4xL5+jEgE827zuGXssFDIuAUZXhpleBmdBrCC9HY4xy0w9VV6YvjP/hrFLGXyMT7M59 HQaOU/M/x1vGbA+bIkLkmEEkSHc6LyCcZQjvddxZb6ahGfHvVeGwI/Vfxu9GAjHTtsOF dhHCGSelTqmCSIiznysglzzpuwStepci9LA2t7d3bNKwLCgQzKBJX/WXZnZpjUzNGZD2 aeDShOUEVtTZMDt/oU1gydEu12WwRE4/HX6ZKl37PcOgPeX1grULkXJYwoqQeApqW/il 2AEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=OVxGkgPM+ULrfKEiuscHC3BiYteIEz9BtWpLpXUfLu0=; b=k71+m8b5eiVArnEINURZF4wOElmSA1VPJSXcd+rrpk8s3h7idnPT4KBWWjqHhpJ1NW r8J2O0nhJ4U+hhkzUlysodQct3pJq79FFRG7r6zcep6gpfoK+1uMUIRt5FlaKxhv1ehW ZLC66JMFTJDxhnXGzTiijn/1yvLr8pg2hpoUkZqz49miTre1lagjS30er7eA5pdiieeZ 6vXclQ2mbC//JBIlSefm3OchLdGtir5Z5rfIUdOZE4/gZCe5UAd8QWuTG/lS3KG0WL4l nkMRY3tDEESUwnJC1Fc4VJ9NljC7XRavVpe6BczHcPdmtUKH1bq2gSmNKIQ1rP9g1nkw 4/uA== X-Gm-Message-State: AMke39nZ+SjkCAZIlEgGUsfua63cU7iOlh23iLe0FdahxfUPCQIuMBcRzWIyBm2RTTv4MKlZ X-Received: by 10.223.148.193 with SMTP id 59mr6882410wrr.199.1488644653255; Sat, 04 Mar 2017 08:24:13 -0800 (PST) Received: from bgdev-debian.lan (jua06-1-82-242-157-225.fbx.proxad.net. [82.242.157.225]) by smtp.gmail.com with ESMTPSA id b17sm7545753wma.33.2017.03.04.08.24.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 04 Mar 2017 08:24:12 -0800 (PST) From: Bartosz Golaszewski To: Linus Walleij , Alexandre Courbot , Bamvor Jian Zhang , Grygorii Strashko , Santosh Shilimkar , Kevin Hilman , Robert Jarzmik Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org, Thomas Gleixner , Marc Zyngier , Bartosz Golaszewski Subject: [PATCH 09/12] gpio: sodaville: use resource management for irqs Date: Sat, 4 Mar 2017 17:23:37 +0100 Message-Id: <1488644620-11488-10-git-send-email-bgolaszewski@baylibre.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1488644620-11488-1-git-send-email-bgolaszewski@baylibre.com> References: <1488644620-11488-1-git-send-email-bgolaszewski@baylibre.com> Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org Use device resource managed variants of irq_alloc_descs() and request_irq() and remove the code manually freeing irq resources. Signed-off-by: Bartosz Golaszewski --- drivers/gpio/gpio-sodaville.c | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/drivers/gpio/gpio-sodaville.c b/drivers/gpio/gpio-sodaville.c index 7da9e6c..f60da83 100644 --- a/drivers/gpio/gpio-sodaville.c +++ b/drivers/gpio/gpio-sodaville.c @@ -135,7 +135,8 @@ static int sdv_register_irqsupport(struct sdv_gpio_chip_data *sd, struct irq_chip_type *ct; int ret; - sd->irq_base = irq_alloc_descs(-1, 0, SDV_NUM_PUB_GPIOS, -1); + sd->irq_base = devm_irq_alloc_descs(&pdev->dev, -1, 0, + SDV_NUM_PUB_GPIOS, -1); if (sd->irq_base < 0) return sd->irq_base; @@ -143,10 +144,11 @@ static int sdv_register_irqsupport(struct sdv_gpio_chip_data *sd, writel(0, sd->gpio_pub_base + GPIO_INT); writel((1 << 11) - 1, sd->gpio_pub_base + GPSTR); - ret = request_irq(pdev->irq, sdv_gpio_pub_irq_handler, IRQF_SHARED, - "sdv_gpio", sd); + ret = devm_request_irq(&pdev->dev, pdev->irq, + sdv_gpio_pub_irq_handler, IRQF_SHARED, + "sdv_gpio", sd); if (ret) - goto out_free_desc; + return ret; /* * This gpio irq controller latches level irqs. Testing shows that if @@ -155,10 +157,8 @@ static int sdv_register_irqsupport(struct sdv_gpio_chip_data *sd, */ sd->gc = irq_alloc_generic_chip("sdv-gpio", 1, sd->irq_base, sd->gpio_pub_base, handle_fasteoi_irq); - if (!sd->gc) { - ret = -ENOMEM; - goto out_free_irq; - } + if (!sd->gc) + return -ENOMEM; sd->gc->private = sd; ct = sd->gc->chip_types; @@ -176,16 +176,10 @@ static int sdv_register_irqsupport(struct sdv_gpio_chip_data *sd, sd->id = irq_domain_add_legacy(pdev->dev.of_node, SDV_NUM_PUB_GPIOS, sd->irq_base, 0, &irq_domain_sdv_ops, sd); - if (!sd->id) { - ret = -ENODEV; - goto out_free_irq; - } + if (!sd->id) + return -ENODEV; + return 0; -out_free_irq: - free_irq(pdev->irq, sd); -out_free_desc: - irq_free_descs(sd->irq_base, SDV_NUM_PUB_GPIOS); - return ret; } static int sdv_gpio_probe(struct pci_dev *pdev,