From de746c387674ea5d3baffe30c09eebf58e7af7ab Mon Sep 17 00:00:00 2001
From: Anton Vorontsov <anton.vorontsov@linaro.org>
Date: Wed, 7 Dec 2011 03:16:26 +0400
Subject: [PATCH] --- yaml --- r: 276450 b: refs/heads/master c:
 77a7300abad7fe01891b400e88d746f97307ee5a h: refs/heads/master v: v3

---
 [refs]                 |  2 +-
 trunk/drivers/of/irq.c | 13 ++++---------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 8d7963290c91..38270aaa74cd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 10ec5e6c0cfcc4289c0cb056cd330ad70ea39b7f
+refs/heads/master: 77a7300abad7fe01891b400e88d746f97307ee5a
diff --git a/trunk/drivers/of/irq.c b/trunk/drivers/of/irq.c
index 19c0115092dd..0f0cfa3bca30 100644
--- a/trunk/drivers/of/irq.c
+++ b/trunk/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
@@ -44,7 +39,7 @@ unsigned int irq_of_parse_and_map(struct device_node *dev, int index)
 	struct of_irq oirq;
 
 	if (of_irq_map_one(dev, index, &oirq))
-		return NO_IRQ;
+		return 0;
 
 	return irq_create_of_mapping(oirq.controller, oirq.specifier,
 				     oirq.size);
@@ -345,7 +340,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 +358,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 +378,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;