From: Arnd Bergmann <arnd@arndb.de>
To: Linus Walleij <linus.walleij@linaro.org>
Cc: linux-arm-kernel@lists.infradead.org,
Arnd Bergmann <arnd@arndb.de>,
Russell King <rmk+kernel@arm.linux.org.uk>,
Bjorn Helgaas <bhelgaas@google.com>,
Alexandre Courbot <gnurou@gmail.com>,
linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org,
Lars-Peter Clausen <lars@metafoo.de>,
Ralf Baechle <ralf@linux-mips.org>,
linux-mips@linux-mips.org, "# v4 . 3+" <stable@vger.kernel.org>,
Alban Bedel <albeu@free.fr>, Thomas Gleixner <tglx@linutronix.de>,
Paul Burton <paul.burton@imgtec.com>
Subject: [PATCH v2 1/5] MIPS: jz4740: remove broken irq_to_gpio() call
Date: Tue, 16 Feb 2016 16:40:34 +0100 [thread overview]
Message-ID: <1455637261-2920972-1-git-send-email-arnd@arndb.de> (raw)
In-Reply-To: <455637086-2794174-1-git-send-email-arnd@arndb.de>
gpiolib has removed the irq_to_gpio() API several years ago,
but the global header still provided a non-working stub.
With a MIPS-wide change to use the generic header file, the jz4740
platform is now using the wrong stub implementation of irq_to_gpio(),
which cannot work.
This uses an open-coded implementation in the only line it
is used in.
Suggested-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: <stable@vger.kernel.org> # v4.3+
Fixes: 832f5dacfa0b ("MIPS: Remove all the uses of custom gpio.h").
---
arch/mips/jz4740/gpio.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/mips/jz4740/gpio.c b/arch/mips/jz4740/gpio.c
index 8c6d76c9b2d6..d9907e57e9b9 100644
--- a/arch/mips/jz4740/gpio.c
+++ b/arch/mips/jz4740/gpio.c
@@ -270,7 +270,7 @@ uint32_t jz_gpio_port_get_value(int port, uint32_t mask)
}
EXPORT_SYMBOL(jz_gpio_port_get_value);
-#define IRQ_TO_BIT(irq) BIT(irq_to_gpio(irq) & 0x1f)
+#define IRQ_TO_BIT(irq) BIT((irq - JZ4740_IRQ_GPIO(0)) & 0x1f)
static void jz_gpio_check_trigger_both(struct jz_gpio_chip *chip, unsigned int irq)
{
--
2.7.0
next parent reply other threads:[~2016-02-16 15:42 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <455637086-2794174-1-git-send-email-arnd@arndb.de>
2016-02-16 15:40 ` Arnd Bergmann [this message]
2016-02-16 15:40 ` [PATCH v2 2/5] gpio: remove broken irq_to_gpio() interface Arnd Bergmann
2016-02-18 23:19 ` Linus Walleij
2016-02-16 15:40 ` [PATCH v2 3/5] gpio: ks8695: remove irq_to_gpio function Arnd Bergmann
2016-02-18 23:20 ` Linus Walleij
2016-02-16 15:40 ` [PATCH v2 4/5] gpio: ep93xx: remove private " Arnd Bergmann
2016-02-18 23:21 ` Linus Walleij
2016-02-16 15:40 ` [PATCH v2 5/5] gpio: allow setting ARCH_NR_GPIOS from Kconfig Arnd Bergmann
2016-02-18 23:23 ` Linus Walleij
2016-02-16 15:47 ` [PATCH v2 1/5] MIPS: jz4740: remove broken irq_to_gpio() call Lars-Peter Clausen
2016-02-16 16:06 ` Ralf Baechle
2016-02-18 23:19 ` Linus Walleij
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1455637261-2920972-1-git-send-email-arnd@arndb.de \
--to=arnd@arndb.de \
--cc=albeu@free.fr \
--cc=bhelgaas@google.com \
--cc=gnurou@gmail.com \
--cc=lars@metafoo.de \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=paul.burton@imgtec.com \
--cc=ralf@linux-mips.org \
--cc=rmk+kernel@arm.linux.org.uk \
--cc=stable@vger.kernel.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®