LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH] Missing include in include/asm-powerpc/prom.h
@ 2007-02-05 14:29 Mathieu Desnoyers
  2007-02-05 20:14 ` Benjamin Herrenschmidt
  0 siblings, 1 reply; 5+ messages in thread
From: Mathieu Desnoyers @ 2007-02-05 14:29 UTC (permalink / raw)
  To: linux-kernel, Andrew Morton, paulus, linuxppc-dev

Missing include in include/asm-powerpc/prom.h

include/asm-powerpc/prom.h needs to include asm/irq.h because it uses
irq_of_parse_and_map and NO_IRQ. It applies on 2.6.20.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>

--- a/include/asm-powerpc/prom.h
+++ b/include/asm-powerpc/prom.h
@@ -19,6 +19,7 @@
 #include <linux/proc_fs.h>
 #include <linux/platform_device.h>
 #include <asm/atomic.h>
+#include <asm/irq.h>
 
 /* Definitions used by the flattened device tree */
 #define OF_DT_HEADER		0xd00dfeed	/* marker */
-- 
OpenPGP public key:              http://krystal.dyndns.org:8080/key/compudj.gpg
Key fingerprint:     8CD5 52C3 8E3C 4140 715F  BA06 3F25 A8FE 3BAE 9A68 

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] Missing include in include/asm-powerpc/prom.h
  2007-02-05 14:29 [PATCH] Missing include in include/asm-powerpc/prom.h Mathieu Desnoyers
@ 2007-02-05 20:14 ` Benjamin Herrenschmidt
  2007-02-05 20:56   ` Mathieu Desnoyers
  0 siblings, 1 reply; 5+ messages in thread
From: Benjamin Herrenschmidt @ 2007-02-05 20:14 UTC (permalink / raw)
  To: Mathieu Desnoyers; +Cc: linux-kernel, Andrew Morton, paulus, linuxppc-dev

On Mon, 2007-02-05 at 09:29 -0500, Mathieu Desnoyers wrote:
> Missing include in include/asm-powerpc/prom.h
> 
> include/asm-powerpc/prom.h needs to include asm/irq.h because it uses
> irq_of_parse_and_map and NO_IRQ. It applies on 2.6.20.

I'd rather not do that.... better to move of_irq_to_resource() to
prom_parse.c 

Ben



^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] Missing include in include/asm-powerpc/prom.h
  2007-02-05 20:14 ` Benjamin Herrenschmidt
@ 2007-02-05 20:56   ` Mathieu Desnoyers
  2007-02-06  0:36     ` Paul Mackerras
  0 siblings, 1 reply; 5+ messages in thread
From: Mathieu Desnoyers @ 2007-02-05 20:56 UTC (permalink / raw)
  To: Benjamin Herrenschmidt; +Cc: linux-kernel, Andrew Morton, paulus, linuxppc-dev

* Benjamin Herrenschmidt (benh@kernel.crashing.org) wrote:
> On Mon, 2007-02-05 at 09:29 -0500, Mathieu Desnoyers wrote:
> > Missing include in include/asm-powerpc/prom.h
> > 
> > include/asm-powerpc/prom.h needs to include asm/irq.h because it uses
> > irq_of_parse_and_map and NO_IRQ. It applies on 2.6.20.
> 
> I'd rather not do that.... better to move of_irq_to_resource() to
> prom_parse.c 
> 

Thanks, this patch should apply on top of the previous patch in this thread.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>

--- a/arch/powerpc/kernel/prom_parse.c
+++ b/arch/powerpc/kernel/prom_parse.c
@@ -1003,3 +1003,18 @@ int of_irq_map_one(struct device_node *device, int index, struct of_irq *out_irq
 	return res;
 }
 EXPORT_SYMBOL_GPL(of_irq_map_one);
+
+int of_irq_to_resource(struct device_node *dev, int index, struct resource *r)
+{
+	int irq = irq_of_parse_and_map(dev, index);
+
+	/* Only dereference the resource if both the
+	 * resource and the irq are valid. */
+	if (r && irq != NO_IRQ) {
+		r->start = r->end = irq;
+		r->flags = IORESOURCE_IRQ;
+	}
+
+	return irq;
+}
+EXPORT_SYMBOL_GPL(of_irq_to_resource);
--- a/include/asm-powerpc/prom.h
+++ b/include/asm-powerpc/prom.h
@@ -335,20 +335,8 @@ extern int of_irq_map_one(struct device_node *device, int index,
 struct pci_dev;
 extern int of_irq_map_pci(struct pci_dev *pdev, struct of_irq *out_irq);
 
-static inline int of_irq_to_resource(struct device_node *dev, int index, struct resource *r)
-{
-	int irq = irq_of_parse_and_map(dev, index);
-
-	/* Only dereference the resource if both the
-	 * resource and the irq are valid. */
-	if (r && irq != NO_IRQ) {
-		r->start = r->end = irq;
-		r->flags = IORESOURCE_IRQ;
-	}
-
-	return irq;
-}
-
+extern int of_irq_to_resource(struct device_node *dev, int index,
+			struct resource *r);
 
 #endif /* __KERNEL__ */
 #endif /* _POWERPC_PROM_H */
-- 
Mathieu Desnoyers
Computer Engineering Graduate Student, École Polytechnique de Montréal
OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F  BA06 3F25 A8FE 3BAE 9A68

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] Missing include in include/asm-powerpc/prom.h
  2007-02-05 20:56   ` Mathieu Desnoyers
@ 2007-02-06  0:36     ` Paul Mackerras
  2007-02-06  1:03       ` [PATCH] Powerpc move of_irq_to_resource from prom.h to prom_parse.c Mathieu Desnoyers
  0 siblings, 1 reply; 5+ messages in thread
From: Paul Mackerras @ 2007-02-06  0:36 UTC (permalink / raw)
  To: Mathieu Desnoyers
  Cc: Benjamin Herrenschmidt, linux-kernel, Andrew Morton, linuxppc-dev

Mathieu Desnoyers writes:

> * Benjamin Herrenschmidt (benh@kernel.crashing.org) wrote:
> > On Mon, 2007-02-05 at 09:29 -0500, Mathieu Desnoyers wrote:
> > > Missing include in include/asm-powerpc/prom.h
> > > 
> > > include/asm-powerpc/prom.h needs to include asm/irq.h because it uses
> > > irq_of_parse_and_map and NO_IRQ. It applies on 2.6.20.
> > 
> > I'd rather not do that.... better to move of_irq_to_resource() to
> > prom_parse.c 
> > 
> 
> Thanks, this patch should apply on top of the previous patch in this thread.

Do you actually want this patch to go upstream?  Because if you do,
that really doesn't cut it as a patch description.  Please look at
http://www.zip.com.au/~akpm/linux/patches/stuff/tpp.txt and resubmit
as one patch with an informative description.

Thanks,
Paul.

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH] Powerpc move of_irq_to_resource from prom.h to prom_parse.c
  2007-02-06  0:36     ` Paul Mackerras
@ 2007-02-06  1:03       ` Mathieu Desnoyers
  0 siblings, 0 replies; 5+ messages in thread
From: Mathieu Desnoyers @ 2007-02-06  1:03 UTC (permalink / raw)
  To: Paul Mackerras
  Cc: Benjamin Herrenschmidt, linux-kernel, Andrew Morton, linuxppc-dev

Powerpc move of_irq_to_resource from prom.h to prom_parse.c

Sorry for the lack of information, it got cut in the previous messages.
Let's start all over again :

In the powerpc architecture, of_irq_to_resource, currently sitting in
prom.h, needs irq_of_parse_and_map and NO_IRQ from asm-powerpc/irq.h.
The solution suggested by Benjamin Herrenschmidt is to move it to
arch/powerpc/kernel/prom_parse.c.

It applies on 2.6.20.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>

--- a/arch/powerpc/kernel/prom_parse.c
+++ b/arch/powerpc/kernel/prom_parse.c
@@ -1003,3 +1003,18 @@ int of_irq_map_one(struct device_node *device, int index, struct of_irq *out_irq
 	return res;
 }
 EXPORT_SYMBOL_GPL(of_irq_map_one);
+
+int of_irq_to_resource(struct device_node *dev, int index, struct resource *r)
+{
+	int irq = irq_of_parse_and_map(dev, index);
+
+	/* Only dereference the resource if both the
+	 * resource and the irq are valid. */
+	if (r && irq != NO_IRQ) {
+		r->start = r->end = irq;
+		r->flags = IORESOURCE_IRQ;
+	}
+
+	return irq;
+}
+EXPORT_SYMBOL_GPL(of_irq_to_resource);
--- a/include/asm-powerpc/prom.h
+++ b/include/asm-powerpc/prom.h
@@ -19,6 +19,7 @@
 #include <linux/proc_fs.h>
 #include <linux/platform_device.h>
 #include <asm/atomic.h>
+#include <asm/irq.h>
 
 /* Definitions used by the flattened device tree */
 #define OF_DT_HEADER		0xd00dfeed	/* marker */
@@ -334,20 +335,8 @@ extern int of_irq_map_one(struct device_node *device, int index,
 struct pci_dev;
 extern int of_irq_map_pci(struct pci_dev *pdev, struct of_irq *out_irq);
 
-static inline int of_irq_to_resource(struct device_node *dev, int index, struct resource *r)
-{
-	int irq = irq_of_parse_and_map(dev, index);
-
-	/* Only dereference the resource if both the
-	 * resource and the irq are valid. */
-	if (r && irq != NO_IRQ) {
-		r->start = r->end = irq;
-		r->flags = IORESOURCE_IRQ;
-	}
-
-	return irq;
-}
-
+extern int of_irq_to_resource(struct device_node *dev, int index,
+			struct resource *r);
 
 #endif /* __KERNEL__ */
 #endif /* _POWERPC_PROM_H */
-- 
Mathieu Desnoyers
Computer Engineering Graduate Student, École Polytechnique de Montréal
OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F  BA06 3F25 A8FE 3BAE 9A68

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2007-02-06  1:03 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2007-02-05 14:29 [PATCH] Missing include in include/asm-powerpc/prom.h Mathieu Desnoyers
2007-02-05 20:14 ` Benjamin Herrenschmidt
2007-02-05 20:56   ` Mathieu Desnoyers
2007-02-06  0:36     ` Paul Mackerras
2007-02-06  1:03       ` [PATCH] Powerpc move of_irq_to_resource from prom.h to prom_parse.c Mathieu Desnoyers

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).