[PATCH v3 17/41] drm: renesas: shmobile: Convert to use devm_request_irq()

[Geert Uytterhoeven]

Convert to managed IRQ handling, to simplify cleanup.

Signed-off-by: Geert Uytterhoeven <geert+rene...@glider.be>
Reviewed-by: Laurent Pinchart <laurent.pinchart+rene...@ideasonboard.com>
---
v3:
  - No changes,

v2:
  - Add Reviewed-by.
---
 drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c 
b/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c
index 91daab80b0ede058..381e184abf552c4c 100644
--- a/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c
+++ b/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c
@@ -196,7 +196,6 @@ static int shmob_drm_remove(struct platform_device *pdev)
 
        drm_dev_unregister(ddev);
        drm_kms_helper_poll_fini(ddev);
-       free_irq(sdev->irq, ddev);
        drm_dev_put(ddev);
 
        return 0;
@@ -279,8 +278,8 @@ static int shmob_drm_probe(struct platform_device *pdev)
                goto err_modeset_cleanup;
        sdev->irq = ret;
 
-       ret = request_irq(sdev->irq, shmob_drm_irq, 0, ddev->driver->name,
-                         ddev);
+       ret = devm_request_irq(&pdev->dev, sdev->irq, shmob_drm_irq, 0,
+                              ddev->driver->name, ddev);
        if (ret < 0) {
                dev_err(&pdev->dev, "failed to install IRQ handler\n");
                goto err_modeset_cleanup;
@@ -292,14 +291,12 @@ static int shmob_drm_probe(struct platform_device *pdev)
         */
        ret = drm_dev_register(ddev, 0);
        if (ret < 0)
-               goto err_irq_uninstall;
+               goto err_modeset_cleanup;
 
        drm_fbdev_generic_setup(ddev, 16);
 
        return 0;
 
-err_irq_uninstall:
-       free_irq(sdev->irq, ddev);
 err_modeset_cleanup:
        drm_kms_helper_poll_fini(ddev);
 err_free_drm_dev:
-- 
2.34.1