projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[POWERPC] Add an optional device_node pointer to the irq_host
[powerpc.git]
/
arch
/
powerpc
/
sysdev
/
cpm2_pic.c
diff --git
a/arch/powerpc/sysdev/cpm2_pic.c
b/arch/powerpc/sysdev/cpm2_pic.c
index
eabfe06
..
d9ab30c
100644
(file)
--- a/
arch/powerpc/sysdev/cpm2_pic.c
+++ b/
arch/powerpc/sysdev/cpm2_pic.c
@@
-50,7
+50,6
@@
static intctl_cpm2_t *cpm2_intctl;
static intctl_cpm2_t *cpm2_intctl;
-static struct device_node *cpm2_pic_node;
static struct irq_host *cpm2_pic_host;
#define NR_MASK_WORDS ((NR_IRQS + 31) / 32)
static unsigned long ppc_cached_irq_mask[NR_MASK_WORDS];
static struct irq_host *cpm2_pic_host;
#define NR_MASK_WORDS ((NR_IRQS + 31) / 32)
static unsigned long ppc_cached_irq_mask[NR_MASK_WORDS];
@@
-208,7
+207,7
@@
unsigned int cpm2_get_irq(void)
static int cpm2_pic_host_match(struct irq_host *h, struct device_node *node)
{
static int cpm2_pic_host_match(struct irq_host *h, struct device_node *node)
{
- return
cpm2_pic
_node == node;
+ return
h->of
_node == node;
}
static int cpm2_pic_host_map(struct irq_host *h, unsigned int virq,
}
static int cpm2_pic_host_map(struct irq_host *h, unsigned int virq,
@@
-273,8
+272,8
@@
void cpm2_pic_init(struct device_node *node)
out_be32(&cpm2_intctl->ic_scprrl, 0x05309770);
/* create a legacy host */
out_be32(&cpm2_intctl->ic_scprrl, 0x05309770);
/* create a legacy host */
- cpm2_pic_
node = of_node_get(node);
-
cpm2_pic_host = irq_alloc_host(IRQ_HOST_MAP_LINEAR,
64, &cpm2_pic_host_ops, 64);
+ cpm2_pic_
host = irq_alloc_host(of_node_get(node), IRQ_HOST_MAP_LINEAR,
+
64, &cpm2_pic_host_ops, 64);
if (cpm2_pic_host == NULL) {
printk(KERN_ERR "CPM2 PIC: failed to allocate irq host!\n");
return;
if (cpm2_pic_host == NULL) {
printk(KERN_ERR "CPM2 PIC: failed to allocate irq host!\n");
return;