With this we can remove the free_irq() calls from probe and remove.

Signed-off-by: Peter Ujfalusi <peter.ujfal...@ti.com>
Reviewed-by: Santosh Shilimkar <santosh.shilim...@ti.com>
---
 drivers/bus/omap_l3_noc.c | 23 +++++------------------
 1 file changed, 5 insertions(+), 18 deletions(-)

diff --git a/drivers/bus/omap_l3_noc.c b/drivers/bus/omap_l3_noc.c
index ca95d3db5055..2bbc87bdea2b 100644
--- a/drivers/bus/omap_l3_noc.c
+++ b/drivers/bus/omap_l3_noc.c
@@ -159,9 +159,8 @@ static int omap4_l3_probe(struct platform_device *pdev)
         * Setup interrupt Handlers
         */
        l3->debug_irq = platform_get_irq(pdev, 0);
-       ret = request_irq(l3->debug_irq,
-                       l3_interrupt_handler,
-                       IRQF_DISABLED, "l3-dbg-irq", l3);
+       ret = devm_request_irq(&pdev->dev, l3->debug_irq, l3_interrupt_handler,
+                              IRQF_DISABLED, "l3-dbg-irq", l3);
        if (ret) {
                pr_crit("L3: request_irq failed to register for 0x%x\n",
                                                l3->debug_irq);
@@ -169,29 +168,17 @@ static int omap4_l3_probe(struct platform_device *pdev)
        }
 
        l3->app_irq = platform_get_irq(pdev, 1);
-       ret = request_irq(l3->app_irq,
-                       l3_interrupt_handler,
-                       IRQF_DISABLED, "l3-app-irq", l3);
-       if (ret) {
+       ret = devm_request_irq(&pdev->dev, l3->app_irq, l3_interrupt_handler,
+                              IRQF_DISABLED, "l3-app-irq", l3);
+       if (ret)
                pr_crit("L3: request_irq failed to register for 0x%x\n",
                                                l3->app_irq);
-               goto err4;
-       }
-
-       return 0;
 
-err4:
-       free_irq(l3->debug_irq, l3);
        return ret;
 }
 
 static int omap4_l3_remove(struct platform_device *pdev)
 {
-       struct omap4_l3 *l3 = platform_get_drvdata(pdev);
-
-       free_irq(l3->app_irq, l3);
-       free_irq(l3->debug_irq, l3);
-
        return 0;
 }
 
-- 
1.9.0

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to