From: Rob Herring <robherring2@gmail.com>
To: Anton Vorontsov <cbouatmailru@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>, Jeff Garzik <jgarzik@redhat.com>,
Grant Likely <grant.likely@secretlab.ca>,
Stephen Rothwell <sfr@canb.auug.org.au>,
devicetree-discuss@lists.ozlabs.org,
LKML <linux-kernel@vger.kernel.org>,
linux-ide@vger.kernel.org, Randy Dunlap <rdunlap@xenotime.net>,
linux-next@vger.kernel.org,
Andrew Morton <akpm@linux-foundation.org>,
Linus Torvalds <torvalds@linux-foundation.org>,
Alan Cox <alan@lxorguk.ukuu.org.uk>
Subject: Re: [PATCH 1/2] of/irq: Get rid of NO_IRQ usage
Date: Tue, 06 Dec 2011 15:22:02 -0600 [thread overview]
Message-ID: <4EDE877A.4080708@gmail.com> (raw)
In-Reply-To: <20111110152541.GA3207@oksana.dev.rtsoft.ru>
On 11/10/2011 09:25 AM, Anton Vorontsov wrote:
> PPC32/64 defines NO_IRQ to zero, so no problems expected.
> ARM defines NO_IRQ to -1, but OF code relies on IRQ domains support,
> which returns correct ('0') value in 'no irq' case. So everything
> should be fine.
>
> Other arches might break if some of their OF drivers rely on NO_IRQ
> being not 0. If so, the drivers must be fixed, finally.
>
> Signed-off-by: Anton Vorontsov <cbouatmailru@gmail.com>
> ---
> drivers/of/irq.c | 30 ++++++++++++++++++------------
> 1 files changed, 18 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/of/irq.c b/drivers/of/irq.c
> index 6d3dd39..2dd4937 100644
> --- a/drivers/of/irq.c
> +++ b/drivers/of/irq.c
> @@ -26,11 +26,6 @@
> #include <linux/string.h>
> #include <linux/slab.h>
>
> -/* For archs that don't support NO_IRQ (such as x86), provide a dummy value */
> -#ifndef NO_IRQ
> -#define NO_IRQ 0
> -#endif
> -
> /**
> * irq_of_parse_and_map - Parse and map an interrupt into linux virq space
> * @device: Device node of the device whose interrupt is to be mapped
> @@ -42,12 +37,23 @@
> unsigned int irq_of_parse_and_map(struct device_node *dev, int index)
> {
> struct of_irq oirq;
> + int ret = 0;
>
> if (of_irq_map_one(dev, index, &oirq))
> - return NO_IRQ;
> -
> - return irq_create_of_mapping(oirq.controller, oirq.specifier,
> - oirq.size);
> + goto no_irq;
> +
> + ret = irq_create_of_mapping(oirq.controller, oirq.specifier,
> + oirq.size);
> +no_irq:
> +#ifdef NO_IRQ
> +#if NO_IRQ != 0
> + if (ret == NO_IRQ)
> + pr_warn("Hit NO_IRQ case for your arch. Drivers might expect "
> + "NO_IRQ, but we return 0. If anything breaks, driver "
> + "have to be fixed.\n");
> +#endif
> +#endif
This warning code is really ugly. Can we just drop it? In my searching
of in kernel dts files, there's only 1 instance I have found (Versatile
AB watchdog) that would hit this.
If not, you don't need to handle irq_create_of_mapping return as that is
already always 0 for no irq or error.
Otherwise, looks fine.
Rob
> + return ret;
> }
> EXPORT_SYMBOL_GPL(irq_of_parse_and_map);
>
> @@ -345,7 +351,7 @@ int of_irq_to_resource(struct device_node *dev, int index, struct resource *r)
>
> /* Only dereference the resource if both the
> * resource and the irq are valid. */
> - if (r && irq != NO_IRQ) {
> + if (r && irq) {
> r->start = r->end = irq;
> r->flags = IORESOURCE_IRQ;
> r->name = dev->full_name;
> @@ -363,7 +369,7 @@ int of_irq_count(struct device_node *dev)
> {
> int nr = 0;
>
> - while (of_irq_to_resource(dev, nr, NULL) != NO_IRQ)
> + while (of_irq_to_resource(dev, nr, NULL))
> nr++;
>
> return nr;
> @@ -383,7 +389,7 @@ int of_irq_to_resource_table(struct device_node *dev, struct resource *res,
> int i;
>
> for (i = 0; i < nr_irqs; i++, res++)
> - if (of_irq_to_resource(dev, i, res) == NO_IRQ)
> + if (!of_irq_to_resource(dev, i, res))
> break;
>
> return i;
next prev parent reply other threads:[~2011-12-06 21:22 UTC|newest]
Thread overview: 80+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-11 9:11 linux-next: Tree for Oct 11 Stephen Rothwell
2011-10-11 18:26 ` [PATCH -next] x86: perf_event_intel.c needs export.h Randy Dunlap
2011-10-11 18:49 ` linux-next: Tree for Oct 11 (mmc) Randy Dunlap
2011-10-11 19:31 ` mmc core broken dependency on CONFIG_BLOCK (Was: linux-next: Tree for Oct 11 (mmc)) Andrei Warkentin
2011-10-11 21:59 ` Randy Dunlap
2011-10-11 23:20 ` NamJae Jeon
2011-10-11 23:48 ` Andrei Warkentin
2011-10-12 0:16 ` NamJae Jeon
2011-10-12 0:50 ` Andrei Warkentin
2011-10-12 1:55 ` NamJae Jeon
2011-10-11 19:15 ` [PATCH -next] jbd2: fix build when CONFIG_BUG is not enabled Randy Dunlap
2011-10-27 8:06 ` Ted Ts'o
2011-10-11 19:26 ` linux-next: Tree for Oct 11 (mfd/intel_msic.c) Randy Dunlap
2011-10-11 19:32 ` linux-next: Tree for Oct 11 (gpio regulator) Randy Dunlap
2011-10-11 20:22 ` Heiko Stübner
2011-10-11 20:37 ` linux-next: Tree for Oct 11 (ata/pata_of_platform.c) Randy Dunlap
2011-10-14 17:58 ` Randy Dunlap
2011-11-10 13:57 ` Ingo Molnar
2011-11-10 14:25 ` Alan Cox
2011-11-10 15:18 ` [PATCH] ata: Fix build error in pata_of_platform (NO_IRQ usage) Anton Vorontsov
2011-11-10 15:25 ` [PATCH 1/2] of/irq: Get rid of NO_IRQ usage Anton Vorontsov
2011-12-06 21:22 ` Rob Herring [this message]
2011-12-06 21:25 ` Linus Torvalds
2011-12-06 23:16 ` [PATCH v3] " Anton Vorontsov
2011-12-07 3:51 ` Rob Herring
[not found] ` <20111206231626.GA31683-wnGakbxT3iijyJ0x5qLZdcN33GVbZNy3@public.gmane.org>
2011-12-07 9:52 ` Wolfram Sang
2011-11-10 15:26 ` [PATCH 2/2] ata: Don't use NO_IRQ in pata_of_platform driver Anton Vorontsov
2011-11-10 15:38 ` Alan Cox
2011-11-10 16:28 ` [PATCH] " Anton Vorontsov
2011-11-10 20:34 ` Jeff Garzik
2011-12-02 19:19 ` Dave Martin
2011-12-02 22:34 ` Anton Vorontsov
2011-12-02 22:40 ` Anton Vorontsov
2011-12-02 22:46 ` Anton Vorontsov
2011-12-02 22:40 ` Linus Torvalds
2011-12-02 23:18 ` [PATCH v2] of/irq: Get rid of NO_IRQ usage Anton Vorontsov
2011-12-02 23:22 ` [PATCH] ata: Don't use NO_IRQ in pata_of_platform driver Alan Cox
2011-12-03 18:56 ` Geert Uytterhoeven
2011-12-02 19:26 ` Dave Martin
2011-12-02 19:28 ` Linus Torvalds
2011-12-02 23:12 ` Benjamin Herrenschmidt
2011-12-05 16:11 ` Dave Martin
2011-12-05 17:40 ` Nicolas Pitre
2011-12-05 18:02 ` Dave Martin
2011-12-05 18:15 ` Geert Uytterhoeven
2011-12-05 18:18 ` Nicolas Pitre
[not found] ` <alpine.LFD.2.02.1112051310150.2357-QuJgVwGFrdf/9pzu0YdTqQ@public.gmane.org>
2011-12-05 18:45 ` Alan Cox
2011-12-05 19:19 ` James Bottomley
2011-12-06 6:13 ` Jean-Christophe PLAGNIOL-VILLARD
[not found] ` <20111206061321.GH9192-RQcB7r2h9QmfDR2tN2SG5Ni2O/JbrIOy@public.gmane.org>
2011-12-06 11:34 ` Alan Cox
2011-12-05 19:16 ` Rob Herring
2011-12-05 20:21 ` Anton Vorontsov
2011-12-05 20:47 ` Rob Herring
[not found] ` <4EDD2DE1.1050606-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2011-12-05 20:53 ` Alan Cox
2011-12-06 9:30 ` Dave Martin
[not found] ` <20111206093000.GA2274-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2011-12-06 10:34 ` Alan Cox
2011-12-06 10:55 ` Russell King - ARM Linux
2011-12-05 19:26 ` Dave Martin
2011-12-05 19:49 ` Nicolas Pitre
2011-12-06 9:37 ` Dave Martin
[not found] ` <20111206093709.GB2274-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2011-12-06 10:46 ` Russell King - ARM Linux
2011-12-06 11:00 ` Geert Uytterhoeven
2011-12-06 11:03 ` Russell King - ARM Linux
2011-12-06 11:10 ` Alan Cox
2011-12-06 11:05 ` Alan Cox
[not found] ` <20111206110554.53bddd14-qBU/x9rampVanCEyBjwyrvXRex20P6io@public.gmane.org>
2011-12-06 11:25 ` Russell King - ARM Linux
2011-12-06 12:11 ` Alan Cox
2011-12-06 11:37 ` Dave Martin
2011-12-06 11:49 ` Russell King - ARM Linux
2011-12-06 13:25 ` Dave Martin
2011-12-06 19:56 ` Rob Herring
2011-12-06 19:20 ` Linus Torvalds
2011-12-06 20:00 ` Russell King - ARM Linux
[not found] ` <CA+55aFwZBr+3_S9kU-+m8zN8iwOvn2miuuAy-zt7sUjW_+abBg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2011-12-06 20:59 ` Uwe Kleine-König
2011-12-06 19:11 ` Nicolas Pitre
[not found] ` <20111205161157.GA27550-bi+AKbBUZKY6gyzm1THtWbp2dZbC/Bob@public.gmane.org>
2011-12-05 17:41 ` Alan Cox
2011-11-10 15:35 ` [PATCH] ata: Fix build error in pata_of_platform (NO_IRQ usage) Alan Cox
2011-11-10 18:18 ` linux-next: Tree for Oct 11 (ata/pata_of_platform.c) Jeff Garzik
[not found] ` <20111011201127.455df266dcbffb1d621f8576-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
2011-10-11 20:45 ` linux-next: Tree for Oct 11 (iio/resolver) Randy Dunlap
[not found] ` <4E94AADA.4080204-/UHa2rfvQTnk1uMJSBkQmQ@public.gmane.org>
2011-10-12 8:58 ` Jonathan Cameron
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=4EDE877A.4080708@gmail.com \
--to=robherring2@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=cbouatmailru@gmail.com \
--cc=devicetree-discuss@lists.ozlabs.org \
--cc=grant.likely@secretlab.ca \
--cc=jgarzik@redhat.com \
--cc=linux-ide@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=rdunlap@xenotime.net \
--cc=sfr@canb.auug.org.au \
--cc=torvalds@linux-foundation.org \
/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).