11 files changed, 15 insertions, 24 deletions

diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
index b5199752ac60..e9238556ae50 100644
--- a/arch/powerpc/kernel/irq.c
+++ b/arch/powerpc/kernel/irq.c
@@ -498,7 +498,7 @@ struct irq_host *irq_alloc_host(struct device_node *of_node,
         host->revmap_type = revmap_type;
         host->inval_irq = inval_irq;
         host->ops = ops;
-        host->of_node = of_node;
+        host->of_node = of_node_get(of_node);
 
         if (host->ops->match == NULL)
                 host->ops->match = default_irq_host_match;
diff --git a/arch/powerpc/platforms/cell/axon_msi.c b/arch/powerpc/platforms/cell/axon_msi.c
index b43defb9918c..896548ba1ca1 100644
--- a/arch/powerpc/platforms/cell/axon_msi.c
+++ b/arch/powerpc/platforms/cell/axon_msi.c
@@ -365,7 +365,7 @@ static int axon_msi_probe(struct of_device *device,
                 goto out_free_fifo;
         }
 
-        msic->irq_host = irq_alloc_host(of_node_get(dn), IRQ_HOST_MAP_NOMAP,
+        msic->irq_host = irq_alloc_host(dn, IRQ_HOST_MAP_NOMAP,
                                         NR_IRQS, &msic_host_ops, 0);
         if (!msic->irq_host) {
                 printk(KERN_ERR "axon_msi: couldn't allocate irq_host for %s\n",
diff --git a/arch/powerpc/platforms/cell/spider-pic.c b/arch/powerpc/platforms/cell/spider-pic.c
index 3f4b4aef756d..4e5655624ae8 100644
--- a/arch/powerpc/platforms/cell/spider-pic.c
+++ b/arch/powerpc/platforms/cell/spider-pic.c
@@ -300,7 +300,7 @@ static void __init spider_init_one(struct device_node *of_node, int chip,
                 panic("spider_pic: can't map registers !");
 
         /* Allocate a host */
-        pic->host = irq_alloc_host(of_node_get(of_node), IRQ_HOST_MAP_LINEAR,
+        pic->host = irq_alloc_host(of_node, IRQ_HOST_MAP_LINEAR,
                                    SPIDER_SRC_COUNT, &spider_host_ops,
                                    SPIDER_IRQ_INVALID);
         if (pic->host == NULL)
diff --git a/arch/powerpc/sysdev/cpm1.c b/arch/powerpc/sysdev/cpm1.c
index 58292a086c16..661df42830b9 100644
--- a/arch/powerpc/sysdev/cpm1.c
+++ b/arch/powerpc/sysdev/cpm1.c
@@ -159,7 +159,7 @@ unsigned int cpm_pic_init(void)
 
         out_be32(&cpic_reg->cpic_cimr, 0);
 
-        cpm_pic_host = irq_alloc_host(of_node_get(np), IRQ_HOST_MAP_LINEAR,
+        cpm_pic_host = irq_alloc_host(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");
diff --git a/arch/powerpc/sysdev/cpm2_pic.c b/arch/powerpc/sysdev/cpm2_pic.c
index 5fe65b2f8f3a..b16ca3ed65d2 100644
--- a/arch/powerpc/sysdev/cpm2_pic.c
+++ b/arch/powerpc/sysdev/cpm2_pic.c
@@ -266,7 +266,7 @@ void cpm2_pic_init(struct device_node *node)
         out_be32(&cpm2_intctl->ic_scprrl, 0x05309770);
 
         /* create a legacy host */
-        cpm2_pic_host = irq_alloc_host(of_node_get(node), IRQ_HOST_MAP_LINEAR,
+        cpm2_pic_host = irq_alloc_host(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");
diff --git a/arch/powerpc/sysdev/i8259.c b/arch/powerpc/sysdev/i8259.c
index 216c0f5680d2..a96584ab33dd 100644
--- a/arch/powerpc/sysdev/i8259.c
+++ b/arch/powerpc/sysdev/i8259.c
@@ -276,7 +276,7 @@ void i8259_init(struct device_node *node, unsigned long intack_addr)
         spin_unlock_irqrestore(&i8259_lock, flags);
 
         /* create a legacy host */
-        i8259_host = irq_alloc_host(of_node_get(node), IRQ_HOST_MAP_LEGACY,
+        i8259_host = irq_alloc_host(node, IRQ_HOST_MAP_LEGACY,
                                     0, &i8259_host_ops, 0);
         if (i8259_host == NULL) {
                 printk(KERN_ERR "i8259: failed to allocate irq host !\n");
diff --git a/arch/powerpc/sysdev/ipic.c b/arch/powerpc/sysdev/ipic.c
index f95d10ba3b9c..caba1c0be5a7 100644
--- a/arch/powerpc/sysdev/ipic.c
+++ b/arch/powerpc/sysdev/ipic.c
@@ -735,13 +735,11 @@ struct ipic * __init ipic_init(struct device_node *node, unsigned int flags)
 
         memset(ipic, 0, sizeof(struct ipic));
 
-        ipic->irqhost = irq_alloc_host(of_node_get(node), IRQ_HOST_MAP_LINEAR,
+        ipic->irqhost = irq_alloc_host(node, IRQ_HOST_MAP_LINEAR,
                                        NR_IPIC_INTS,
                                        &ipic_host_ops, 0);
-        if (ipic->irqhost == NULL) {
-                of_node_put(node);
+        if (ipic->irqhost == NULL)
                 return NULL;
-        }
 
         ipic->regs = ioremap(res.start, res.end - res.start + 1);
 
diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c
index a281341e4129..5788a6ab1254 100644
--- a/arch/powerpc/sysdev/mpic.c
+++ b/arch/powerpc/sysdev/mpic.c
@@ -1016,13 +1016,11 @@ struct mpic * __init mpic_alloc(struct device_node *node,
         memset(mpic, 0, sizeof(struct mpic));
         mpic->name = name;
 
-        mpic->irqhost = irq_alloc_host(of_node_get(node), IRQ_HOST_MAP_LINEAR,
+        mpic->irqhost = irq_alloc_host(node, IRQ_HOST_MAP_LINEAR,
                                        isu_size, &mpic_host_ops,
                                        flags & MPIC_LARGE_VECTORS ? 2048 : 256);
-        if (mpic->irqhost == NULL) {
-                of_node_put(node);
+        if (mpic->irqhost == NULL)
                 return NULL;
-        }
 
         mpic->irqhost->host_data = mpic;
         mpic->hc_irq = mpic_irq_chip;
diff --git a/arch/powerpc/sysdev/qe_lib/qe_ic.c b/arch/powerpc/sysdev/qe_lib/qe_ic.c
index c11b313f015b..63cdf9887f36 100644
--- a/arch/powerpc/sysdev/qe_lib/qe_ic.c
+++ b/arch/powerpc/sysdev/qe_lib/qe_ic.c
@@ -339,12 +339,10 @@ void __init qe_ic_init(struct device_node *node, unsigned int flags,
 
         memset(qe_ic, 0, sizeof(struct qe_ic));
 
-        qe_ic->irqhost = irq_alloc_host(of_node_get(node), IRQ_HOST_MAP_LINEAR,
+        qe_ic->irqhost = irq_alloc_host(node, IRQ_HOST_MAP_LINEAR,
                                         NR_QE_IC_INTS, &qe_ic_host_ops, 0);
-        if (qe_ic->irqhost == NULL) {
-                of_node_put(node);
+        if (qe_ic->irqhost == NULL)
                 return;
-        }
 
         qe_ic->regs = ioremap(res.start, res.end - res.start + 1);
 
diff --git a/arch/powerpc/sysdev/tsi108_pci.c b/arch/powerpc/sysdev/tsi108_pci.c
index ac1a72dc21e5..24e1f5a197ae 100644
--- a/arch/powerpc/sysdev/tsi108_pci.c
+++ b/arch/powerpc/sysdev/tsi108_pci.c
@@ -426,11 +426,10 @@ void __init tsi108_pci_int_init(struct device_node *node)
 {
         DBG("Tsi108_pci_int_init: initializing PCI interrupts\n");
 
-        pci_irq_host = irq_alloc_host(of_node_get(node), IRQ_HOST_MAP_LEGACY,
+        pci_irq_host = irq_alloc_host(node, IRQ_HOST_MAP_LEGACY,
                                       0, &pci_irq_host_ops, 0);
         if (pci_irq_host == NULL) {
                 printk(KERN_ERR "pci_irq_host: failed to allocate irq host !\n");
-                of_node_put(node);
                 return;
         }
 
diff --git a/arch/powerpc/sysdev/uic.c b/arch/powerpc/sysdev/uic.c
index 625b275c3795..d35405c59434 100644
--- a/arch/powerpc/sysdev/uic.c
+++ b/arch/powerpc/sysdev/uic.c
@@ -280,12 +280,10 @@ static struct uic * __init uic_init_one(struct device_node *node)
         }
         uic->dcrbase = *dcrreg;
 
-        uic->irqhost = irq_alloc_host(of_node_get(node), IRQ_HOST_MAP_LINEAR,
+        uic->irqhost = irq_alloc_host(node, IRQ_HOST_MAP_LINEAR,
                                       NR_UIC_INTS, &uic_host_ops, -1);
-        if (! uic->irqhost) {
-                of_node_put(node);
+        if (! uic->irqhost)
                 return NULL; /* FIXME: panic? */
-        }
 
         uic->irqhost->host_data = uic;