From patchwork Fri Aug 31 14:37:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans Verkuil X-Patchwork-Id: 964493 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-gpio-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=xs4all.nl Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42225V4NtBz9rvt for ; Sat, 1 Sep 2018 00:37:50 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728647AbeHaSpe (ORCPT ); Fri, 31 Aug 2018 14:45:34 -0400 Received: from lb3-smtp-cloud8.xs4all.net ([194.109.24.29]:44870 "EHLO lb3-smtp-cloud8.xs4all.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728623AbeHaSpe (ORCPT ); Fri, 31 Aug 2018 14:45:34 -0400 Received: from marune.fritz.box ([80.101.105.217]) by smtp-cloud8.xs4all.net with ESMTPA id vkYSfoJHlaLLbvkYUf2rGa; Fri, 31 Aug 2018 16:37:46 +0200 From: Hans Verkuil To: linux-gpio@vger.kernel.org Cc: Linus Walleij , ilina@codeaurora.org, Marc Zyngier , Thomas Gleixner , Hans Verkuil Subject: [RFCv3 PATCH 4/4] gpio-bcm-kona: use new req/relres and dis/enable_irq funcs Date: Fri, 31 Aug 2018 16:37:44 +0200 Message-Id: <20180831143744.126063-5-hverkuil@xs4all.nl> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180831143744.126063-1-hverkuil@xs4all.nl> References: <20180831143744.126063-1-hverkuil@xs4all.nl> X-CMAE-Envelope: MS4wfPUZzgoaokfOvPU9tEiUIeJcncxPUZYNXbK4OxK47c3bSVewuCVUV2VPcebR6CiQcuYVTzUkey2NRT3Dxa95Y++nhHBE6bAui4UYXV+TO+FxUoipIq6D ecENO0dGhDx5BOJM174rcRe/WAe0amt1MzfCnlJoO0Ix0IzZ6mp+OOrXpGp4dGfWvOFSNxvXLcLK3CS+p41GFNi5AQsU7CwXl0vOEPvqeG8PQWVuKw7d/jZU kshTqAqleogXKYPkCriZRgv7rpsnkL9auNF/ta+68Pd5V8UMDewYQ+FMNAOjiXfiWNnfyXBS3hY7uzLCzUUVdWG23pDqwVK9HlyQ+DZtAmjIGxyWej7ZAzJU BBHfVnsm Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org From: Hans Verkuil Since this driver does not use the gpiolib irqchip helpers it will have to allocate the irq resources and irq_en/disable itself. Use the new gpiochip_req/relres_irq helpers to request/release all the resources. Signed-off-by: Hans Verkuil --- drivers/gpio/gpio-bcm-kona.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/drivers/gpio/gpio-bcm-kona.c b/drivers/gpio/gpio-bcm-kona.c index d0707fc23afd..c5536a509b59 100644 --- a/drivers/gpio/gpio-bcm-kona.c +++ b/drivers/gpio/gpio-bcm-kona.c @@ -373,6 +373,7 @@ static void bcm_kona_gpio_irq_mask(struct irq_data *d) val = readl(reg_base + GPIO_INT_MASK(bank_id)); val |= BIT(bit); writel(val, reg_base + GPIO_INT_MASK(bank_id)); + gpiochip_disable_irq(&kona_gpio->gpio_chip, gpio); raw_spin_unlock_irqrestore(&kona_gpio->lock, flags); } @@ -394,6 +395,7 @@ static void bcm_kona_gpio_irq_unmask(struct irq_data *d) val = readl(reg_base + GPIO_INT_MSKCLR(bank_id)); val |= BIT(bit); writel(val, reg_base + GPIO_INT_MSKCLR(bank_id)); + gpiochip_enable_irq(&kona_gpio->gpio_chip, gpio); raw_spin_unlock_irqrestore(&kona_gpio->lock, flags); } @@ -485,23 +487,15 @@ static void bcm_kona_gpio_irq_handler(struct irq_desc *desc) static int bcm_kona_gpio_irq_reqres(struct irq_data *d) { struct bcm_kona_gpio *kona_gpio = irq_data_get_irq_chip_data(d); - int ret; - ret = gpiochip_lock_as_irq(&kona_gpio->gpio_chip, d->hwirq); - if (ret) { - dev_err(kona_gpio->gpio_chip.parent, - "unable to lock HW IRQ %lu for IRQ\n", - d->hwirq); - return ret; - } - return 0; + return gpiochip_reqres_irq(&kona_gpio->gpio_chip, d->hwirq); } static void bcm_kona_gpio_irq_relres(struct irq_data *d) { struct bcm_kona_gpio *kona_gpio = irq_data_get_irq_chip_data(d); - gpiochip_unlock_as_irq(&kona_gpio->gpio_chip, d->hwirq); + gpiochip_relres_irq(&kona_gpio->gpio_chip, d->hwirq); } static struct irq_chip bcm_gpio_irq_chip = {