diff options
author | Kumar Gala <galak@kernel.crashing.org> | 2007-01-26 01:45:32 -0600 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2007-01-26 01:45:32 -0600 |
commit | 126186a055d965d5a7b1ab560e343ef70694f349 (patch) | |
tree | e4b88a405711760a043994ba910578e8df8d60a5 | |
parent | e60bd7f14dbb6239d07676be420a21f8a36d014f (diff) | |
download | op-kernel-dev-126186a055d965d5a7b1ab560e343ef70694f349.zip op-kernel-dev-126186a055d965d5a7b1ab560e343ef70694f349.tar.gz |
[POWERPC] 83xx: Return a point to the struct ipic from ipic_init()
It's useful to have access to struct ipic handle that just got created
in ipic_init().
For example, if we want to setup an external IRQ with out
a device node we need access ipic->irqhost to create the virtual to HW
IRQ mapping and to set the IRQ sense. With this we can mimic the old
sense array concept that existed in arch/ppc.
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
-rw-r--r-- | arch/powerpc/sysdev/ipic.c | 15 | ||||
-rw-r--r-- | include/asm-powerpc/ipic.h | 2 |
2 files changed, 10 insertions, 7 deletions
diff --git a/arch/powerpc/sysdev/ipic.c b/arch/powerpc/sysdev/ipic.c index 522aa14..473c415 100644 --- a/arch/powerpc/sysdev/ipic.c +++ b/arch/powerpc/sysdev/ipic.c @@ -557,8 +557,7 @@ static struct irq_host_ops ipic_host_ops = { .xlate = ipic_host_xlate, }; -void __init ipic_init(struct device_node *node, - unsigned int flags) +struct ipic * __init ipic_init(struct device_node *node, unsigned int flags) { struct ipic *ipic; struct resource res; @@ -566,7 +565,7 @@ void __init ipic_init(struct device_node *node, ipic = alloc_bootmem(sizeof(struct ipic)); if (ipic == NULL) - return; + return NULL; memset(ipic, 0, sizeof(struct ipic)); ipic->of_node = of_node_get(node); @@ -576,12 +575,14 @@ void __init ipic_init(struct device_node *node, &ipic_host_ops, 0); if (ipic->irqhost == NULL) { of_node_put(node); - return; + return NULL; } ret = of_address_to_resource(node, 0, &res); - if (ret) - return; + if (ret) { + of_node_put(node); + return NULL; + } ipic->regs = ioremap(res.start, res.end - res.start + 1); @@ -625,6 +626,8 @@ void __init ipic_init(struct device_node *node, printk ("IPIC (%d IRQ sources) at %p\n", NR_IPIC_INTS, primary_ipic->regs); + + return ipic; } int ipic_set_priority(unsigned int virq, unsigned int priority) diff --git a/include/asm-powerpc/ipic.h b/include/asm-powerpc/ipic.h index 9fbb034..edec79d 100644 --- a/include/asm-powerpc/ipic.h +++ b/include/asm-powerpc/ipic.h @@ -78,7 +78,7 @@ extern u32 ipic_get_mcp_status(void); extern void ipic_clear_mcp_status(u32 mask); #ifdef CONFIG_PPC_MERGE -extern void ipic_init(struct device_node *node, unsigned int flags); +extern struct ipic * ipic_init(struct device_node *node, unsigned int flags); extern unsigned int ipic_get_irq(void); #else extern void ipic_init(phys_addr_t phys_addr, unsigned int flags, |