From patchwork Thu Sep 16 11:19:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kunihiko Hayashi X-Patchwork-Id: 512924 Delivered-To: patch@linaro.org Received: by 2002:a17:906:f46:0:0:0:0 with SMTP id h6csp1057112ejj; Thu, 16 Sep 2021 04:19:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwHR90m2tjSueCiTrf4W/MUKe8vYV9PLhIxibW6f19311NcxvJZyTYsTcg6UnfjWqIT/Ptt X-Received: by 2002:a5e:dc0b:: with SMTP id b11mr3782037iok.91.1631791192147; Thu, 16 Sep 2021 04:19:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631791192; cv=none; d=google.com; s=arc-20160816; b=e1r0zszHE0pkrNyGhRmNh0/17hs/QXigPX0GlSHYlsAqwseXNTMaTzwJSXNOg08C+t MUSCLRUbqD8yedMgs0lO6SF/BMpvnyw5Pn/nW12wzbBc4EPsk/1Jd9fJNViwW/vIsGpj OWnHEMJeOiTE6wcBG1SgMvJ93kK3rBbr1g1T1LdiQtR4CXNsPjSwq/wWzumkHeGvMTgj zgiCuoF2HerHbCdWVkpablgYMuS1s8kDHU1j4lSa9F06p+2kXTduck7y6dke78TmGcXE cv9of0BjuzbxuIzQk9HrlVFg+4nLjrvhpfy8hYu1oARgnEN6L8lhsrqazK+3pS9CpL6g fijQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from; bh=yldtNHRoa38tfSo9tXxrB/Z/QAlN2Fe93YGjWq8menE=; b=lhF2jNHU9U2On4Ti33YnNdGfqjOWDTJMJXI+T48IguWLfLLqhKyMk9fglf5SOWkyfU aomQmAn2k6QCIPlgcFhl4OQgdUgqJeCbccwwDy2XoBkadGi9siKIXZyW21mUD6llS8er kAL1VLFORycmeWIa+PeBA8hDNfNEDwWKP7jrdZMBchz5+J2Y0Y/7ZeQAPGstaYf+Zigz iOrBKSE80qAUy8hY8FFMoL3Zq/S+Wb5oF2blK6yIBUxqI3hpO481FyxuUbKmc/mtn+cU M8LiTt68+VJOYYM+FaHxq8cqFDo7HpIsnxhdX91vGr4EXdO85P/81eplK0zlgB8NfdIg 8zUw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-gpio-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-gpio-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id q6si2325950ilv.123.2021.09.16.04.19.51; Thu, 16 Sep 2021 04:19:52 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-gpio-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-gpio-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-gpio-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237706AbhIPLVK (ORCPT + 3 others); Thu, 16 Sep 2021 07:21:10 -0400 Received: from mx.socionext.com ([202.248.49.38]:27922 "EHLO mx.socionext.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235686AbhIPLVJ (ORCPT ); Thu, 16 Sep 2021 07:21:09 -0400 Received: from unknown (HELO iyokan2-ex.css.socionext.com) ([172.31.9.54]) by mx.socionext.com with ESMTP; 16 Sep 2021 20:19:48 +0900 Received: from mail.mfilter.local (m-filter-1 [10.213.24.61]) by iyokan2-ex.css.socionext.com (Postfix) with ESMTP id C9F6D2021820; Thu, 16 Sep 2021 20:19:48 +0900 (JST) Received: from 172.31.9.51 (172.31.9.51) by m-FILTER with ESMTP; Thu, 16 Sep 2021 20:19:48 +0900 Received: from plum.e01.socionext.com (unknown [10.212.243.119]) by kinkan2.css.socionext.com (Postfix) with ESMTP id 70B4EAB192; Thu, 16 Sep 2021 20:19:48 +0900 (JST) From: Kunihiko Hayashi To: Linus Walleij , Bartosz Golaszewski , Masami Hiramatsu Cc: linux-gpio@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Kunihiko Hayashi Subject: [PATCH 2/3] gpio: uniphier: Use helper function to get IRQ hardware number Date: Thu, 16 Sep 2021 20:19:36 +0900 Message-Id: <1631791177-27229-3-git-send-email-hayashi.kunihiko@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1631791177-27229-1-git-send-email-hayashi.kunihiko@socionext.com> References: <1631791177-27229-1-git-send-email-hayashi.kunihiko@socionext.com> Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org Use helper function to get IRQ hardware number instead of direct access. No functional changes intended. Signed-off-by: Kunihiko Hayashi --- drivers/gpio/gpio-uniphier.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) -- 2.7.4 diff --git a/drivers/gpio/gpio-uniphier.c b/drivers/gpio/gpio-uniphier.c index 39dca14..dca96f5 100644 --- a/drivers/gpio/gpio-uniphier.c +++ b/drivers/gpio/gpio-uniphier.c @@ -180,7 +180,7 @@ static int uniphier_gpio_to_irq(struct gpio_chip *chip, unsigned int offset) static void uniphier_gpio_irq_mask(struct irq_data *data) { struct uniphier_gpio_priv *priv = data->chip_data; - u32 mask = BIT(data->hwirq); + u32 mask = BIT(irqd_to_hwirq(data)); uniphier_gpio_reg_update(priv, UNIPHIER_GPIO_IRQ_EN, mask, 0); @@ -190,7 +190,7 @@ static void uniphier_gpio_irq_mask(struct irq_data *data) static void uniphier_gpio_irq_unmask(struct irq_data *data) { struct uniphier_gpio_priv *priv = data->chip_data; - u32 mask = BIT(data->hwirq); + u32 mask = BIT(irqd_to_hwirq(data)); uniphier_gpio_reg_update(priv, UNIPHIER_GPIO_IRQ_EN, mask, mask); @@ -200,7 +200,7 @@ static void uniphier_gpio_irq_unmask(struct irq_data *data) static int uniphier_gpio_irq_set_type(struct irq_data *data, unsigned int type) { struct uniphier_gpio_priv *priv = data->chip_data; - u32 mask = BIT(data->hwirq); + u32 mask = BIT(irqd_to_hwirq(data)); u32 val = 0; if (type == IRQ_TYPE_EDGE_BOTH) { @@ -297,7 +297,8 @@ static int uniphier_gpio_irq_domain_activate(struct irq_domain *domain, struct uniphier_gpio_priv *priv = domain->host_data; struct gpio_chip *chip = &priv->chip; - return gpiochip_lock_as_irq(chip, data->hwirq + UNIPHIER_GPIO_IRQ_OFFSET); + return gpiochip_lock_as_irq(chip, + irqd_to_hwirq(data) + UNIPHIER_GPIO_IRQ_OFFSET); } static void uniphier_gpio_irq_domain_deactivate(struct irq_domain *domain, @@ -306,7 +307,8 @@ static void uniphier_gpio_irq_domain_deactivate(struct irq_domain *domain, struct uniphier_gpio_priv *priv = domain->host_data; struct gpio_chip *chip = &priv->chip; - gpiochip_unlock_as_irq(chip, data->hwirq + UNIPHIER_GPIO_IRQ_OFFSET); + gpiochip_unlock_as_irq(chip, + irqd_to_hwirq(data) + UNIPHIER_GPIO_IRQ_OFFSET); } static const struct irq_domain_ops uniphier_gpio_irq_domain_ops = {