davinci_cpdma: make cpdma_chan_split_pool static

[linux.git] / drivers / irqchip / irq-renesas-rza1.c

diff --git a/drivers/irqchip/irq-renesas-rza1.c b/drivers/irqchip/irq-renesas-rza1.c
index b1f19b210190184f0a01d1304155d5ed2abf1590..b0d46ac42b892340ce649ee14acbd42dc1f0ef8c 100644 (file)
--- a/drivers/irqchip/irq-renesas-rza1.c
+++ b/drivers/irqchip/irq-renesas-rza1.c
@@ -208,20 +208,19 @@ static int rza1_irqc_probe(struct platform_device *pdev)
                return PTR_ERR(priv->base);
 
        gic_node = of_irq_find_parent(np);
-       if (gic_node) {
+       if (gic_node)
                parent = irq_find_host(gic_node);
-               of_node_put(gic_node);
-       }
 
        if (!parent) {
                dev_err(dev, "cannot find parent domain\n");
-               return -ENODEV;
+               ret = -ENODEV;
+               goto out_put_node;
        }
 
        ret = rza1_irqc_parse_map(priv, gic_node);
        if (ret) {
                dev_err(dev, "cannot parse %s: %d\n", "interrupt-map", ret);
-               return ret;
+               goto out_put_node;
        }
 
        priv->chip.name = "rza1-irqc",
@@ -237,10 +236,12 @@ static int rza1_irqc_probe(struct platform_device *pdev)
                                                    priv);
        if (!priv->irq_domain) {
                dev_err(dev, "cannot initialize irq domain\n");
-               return -ENOMEM;
+               ret = -ENOMEM;
        }
 
-       return 0;
+out_put_node:
+       of_node_put(gic_node);
+       return ret;
 }
 
 static int rza1_irqc_remove(struct platform_device *pdev)