]> rtime.felk.cvut.cz Git - can-eth-gw-linux.git/commitdiff
drivers: bus: omap_l3: use resources instead of hardcoded irqs
authorOlof Johansson <olof@lixom.net>
Thu, 20 Sep 2012 23:10:02 +0000 (16:10 -0700)
committerOlof Johansson <olof@lixom.net>
Thu, 20 Sep 2012 23:12:36 +0000 (16:12 -0700)
This fixes up a merge conflict due to the move of the driver and cleanups of
platform data around the same time. Moving to the resource is what we want
anyway, so do it in this branch.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
[olof: rewrote with this branch as base, same end result]
Signed-off-by: Olof Johansson <olof@lixom.net>
Acked-by: Tony Lindgren <tony@atomide.com>
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
drivers/bus/omap_l3_noc.c

index d15225ff5c4969b3ddde9cc79ece7caf725001eb..ab911a33f8a894a9ea06d04428e4db3b50d7c342 100644 (file)
@@ -190,7 +190,7 @@ static int __devinit omap4_l3_probe(struct platform_device *pdev)
                        IRQF_DISABLED, "l3-dbg-irq", l3);
        if (ret) {
                pr_crit("L3: request_irq failed to register for 0x%x\n",
-                                               OMAP44XX_IRQ_L3_DBG);
+                                               l3->debug_irq);
                goto err3;
        }
 
@@ -200,7 +200,7 @@ static int __devinit omap4_l3_probe(struct platform_device *pdev)
                        IRQF_DISABLED, "l3-app-irq", l3);
        if (ret) {
                pr_crit("L3: request_irq failed to register for 0x%x\n",
-                                               OMAP44XX_IRQ_L3_APP);
+                                               l3->app_irq);
                goto err4;
        }