diff options
| author | Michael Ellerman <michael@ellerman.id.au> | 2007-08-28 08:47:54 (GMT) |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-09-13 15:33:20 (GMT) |
| commit | 52964f87c64e6c6ea671b5bf3030fb1494090a48 (patch) | |
| tree | 2e20d81bc05b60b7108733daf5713ea640ad2477 /arch/powerpc/sysdev/commproc.c | |
| parent | 0ae0b54565a8dcc2b98de694b998e765de15b713 (diff) | |
| download | linux-fsl-qoriq-52964f87c64e6c6ea671b5bf3030fb1494090a48.tar.xz | |
[POWERPC] Add an optional device_node pointer to the irq_host
The majority of irq_host implementations (3 out of 4) are associated
with a device_node, and need to stash it somewhere. Rather than having
it somewhere different for each host, add an optional device_node pointer
to the irq_host structure.
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/sysdev/commproc.c')
| -rw-r--r-- | arch/powerpc/sysdev/commproc.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/powerpc/sysdev/commproc.c b/arch/powerpc/sysdev/commproc.c index e8e79f8..05dc30b 100644 --- a/arch/powerpc/sysdev/commproc.c +++ b/arch/powerpc/sysdev/commproc.c @@ -50,7 +50,6 @@ static uint host_end; /* end + 1 */ cpm8xx_t *cpmp; /* Pointer to comm processor space */ cpic8xx_t *cpic_reg; -static struct device_node *cpm_pic_node; static struct irq_host *cpm_pic_host; static void cpm_mask_irq(unsigned int irq) @@ -97,7 +96,7 @@ int cpm_get_irq(void) static int cpm_pic_host_match(struct irq_host *h, struct device_node *node) { - return cpm_pic_node == node; + return h->of_node == node; } static int cpm_pic_host_map(struct irq_host *h, unsigned int virq, @@ -165,9 +164,8 @@ unsigned int cpm_pic_init(void) out_be32(&cpic_reg->cpic_cimr, 0); - cpm_pic_node = of_node_get(np); - - cpm_pic_host = irq_alloc_host(IRQ_HOST_MAP_LINEAR, 64, &cpm_pic_host_ops, 64); + cpm_pic_host = irq_alloc_host(of_node_get(np), IRQ_HOST_MAP_LINEAR, + 64, &cpm_pic_host_ops, 64); if (cpm_pic_host == NULL) { printk(KERN_ERR "CPM2 PIC: failed to allocate irq host!\n"); sirq = NO_IRQ; |