From: Olof Johansson Date: Thu, 20 Sep 2012 23:10:02 +0000 (-0700) Subject: drivers: bus: omap_l3: use resources instead of hardcoded irqs X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2c2d16745a3a0924e2335722f5a1676a0c501b1f;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git drivers: bus: omap_l3: use resources instead of hardcoded irqs 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 [olof: rewrote with this branch as base, same end result] Signed-off-by: Olof Johansson Acked-by: Tony Lindgren Acked-by: Santosh Shilimkar --- diff --git a/drivers/bus/omap_l3_noc.c b/drivers/bus/omap_l3_noc.c index d15225ff5c49..ab911a33f8a8 100644 --- a/drivers/bus/omap_l3_noc.c +++ b/drivers/bus/omap_l3_noc.c @@ -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; }