diff options
| author | David S. Miller <davem@davemloft.net> | 2008-08-25 16:44:58 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-08-25 16:44:58 -0700 |
| commit | 51e0f004a9ab9104acbe323c0b20e0279bf9be85 (patch) | |
| tree | 477ccb9efa52eff7531cd04dc605bbf9e90152a4 /arch/sparc/include/asm/prom.h | |
| parent | 783c98b911fce8d47aa2906468ca39d44d46d7ce (diff) | |
| download | blackbird-op-linux-51e0f004a9ab9104acbe323c0b20e0279bf9be85.tar.gz blackbird-op-linux-51e0f004a9ab9104acbe323c0b20e0279bf9be85.zip | |
sparc64: Fix irq_of_parse_and_map() and irq_dispose_mapping().
Stephen Rothwell noticed that I committed an earlier version
of the patch that didn't have two things fixed:
1) irq_of_parse_and_map() should return "unsigned int" not "int"
and it should return zero for "no irq"
2) irq_dispose_mapping() should be an inline function, not a macro,
for type checking
With feedback and suggestions from Anton Vorontsov.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/include/asm/prom.h')
| -rw-r--r-- | arch/sparc/include/asm/prom.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/sparc/include/asm/prom.h b/arch/sparc/include/asm/prom.h index 58b85fa56066..900d44714f8d 100644 --- a/arch/sparc/include/asm/prom.h +++ b/arch/sparc/include/asm/prom.h @@ -101,8 +101,10 @@ static inline void of_node_put(struct device_node *node) * register them in the of_device objects, whereas powerpc computes them * on request. */ -extern int irq_of_parse_and_map(struct device_node *node, int index); -#define irq_dispose_mapping(irq) do { } while (0) +extern unsigned int irq_of_parse_and_map(struct device_node *node, int index); +static inline void irq_dispose_mapping(unsigned int virq) +{ +} /* * NB: This is here while we transition from using asm/prom.h |
