From: Russell King - ARM Linux <linux@armlinux.org.uk>
To: Arnd Bergmann <arnd@arndb.de>
Cc: Lee Jones <lee.jones@linaro.org>,
Linus Walleij <linus.walleij@linaro.org>,
Hans-Christian Egtvedt <egtvedt@samfundet.no>,
Dmitry Torokhov <dmitry.torokhov@gmail.com>,
Thomas Gleixner <tglx@linutronix.de>,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] mfd: ucb1x00: remove NO_IRQ check
Date: Tue, 6 Sep 2016 14:17:30 +0100 [thread overview]
Message-ID: <20160906131730.GV1041@n2100.armlinux.org.uk> (raw)
In-Reply-To: <20160906130409.1691750-1-arnd@arndb.de>
You need to send this _to_ me as I need to merge it with my other
changes. This patch on its own does not make sense - it only makes
sense with the rest of my SA11x0 patch stack.
NAK for Lee to merge this.
On Tue, Sep 06, 2016 at 03:03:57PM +0200, Arnd Bergmann wrote:
> probe_irq_off() returns '0' on failure, not NO_IRQ, so the check
> in this driver is clearly wrong. This replaces it with the
> regular '!irq' check used in other drivers.
>
> The sa1100 platform that this driver is used on originally numbered
> all its interrupts starting at '0', which would have conflicted with
> this change, but as of commit 18f3aec ("ARM: 8230/1: sa1100: shift
> IRQs by one"), this is not a problem any more.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> drivers/mfd/ucb1x00-core.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/mfd/ucb1x00-core.c b/drivers/mfd/ucb1x00-core.c
> index 48bea5038654..d6fb2e1a759a 100644
> --- a/drivers/mfd/ucb1x00-core.c
> +++ b/drivers/mfd/ucb1x00-core.c
> @@ -537,7 +537,7 @@ static int ucb1x00_probe(struct mcp *mcp)
> ucb1x00_enable(ucb);
> ucb->irq = ucb1x00_detect_irq(ucb);
> ucb1x00_disable(ucb);
> - if (ucb->irq == NO_IRQ) {
> + if (!ucb->irq) {
> dev_err(&ucb->dev, "IRQ probe failed\n");
> ret = -ENODEV;
> goto err_no_irq;
> --
> 2.9.0
>
--
RMK's Patch system: http://www.armlinux.org.uk/developer/patches/
FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up
according to speedtest.net.
next prev parent reply other threads:[~2016-09-06 13:19 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-06 13:03 [PATCH] mfd: ucb1x00: remove NO_IRQ check Arnd Bergmann
2016-09-06 13:17 ` Russell King - ARM Linux [this message]
2016-09-06 13:49 ` Arnd Bergmann
2016-09-06 15:45 ` Lee Jones
2016-09-06 16:28 ` Russell King - ARM Linux
2016-09-07 10:27 ` Lee Jones
2016-09-07 11:27 ` Russell King - ARM Linux
2016-09-07 12:48 ` Lee Jones
2016-09-07 13:44 ` Russell King - ARM Linux
2016-09-07 15:08 ` Lee Jones
2016-09-07 16:07 ` Russell King - ARM Linux
2016-09-07 16:27 ` Lee Jones
2016-09-07 16:36 ` Russell King - ARM Linux
[not found] ` <1473265954.29864.15.camel@perches.com>
[not found] ` <20160907163854.GE4921@dell>
2016-09-07 19:47 ` rfc: Updating SubmittingPatches with [RFC PATCH] and/or [WIP PATCH] Joe Perches
2016-09-07 21:49 ` Randy Dunlap
2016-09-14 19:03 ` Jonathan Corbet
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=20160906131730.GV1041@n2100.armlinux.org.uk \
--to=linux@armlinux.org.uk \
--cc=arnd@arndb.de \
--cc=dmitry.torokhov@gmail.com \
--cc=egtvedt@samfundet.no \
--cc=lee.jones@linaro.org \
--cc=linus.walleij@linaro.org \
--cc=linux-kernel@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;
as well as URLs for NNTP newsgroup(s).