Commit 901500a8 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven

drm: renesas: shmobile: Convert to use devm_request_irq()

Convert to managed IRQ handling, to simplify cleanup.
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/8d870bdc59dd5e2754542388a03095ea09c96297.1694767209.git.geert+renesas@glider.be
parent 95478b08
...@@ -196,7 +196,6 @@ static void shmob_drm_remove(struct platform_device *pdev) ...@@ -196,7 +196,6 @@ static void shmob_drm_remove(struct platform_device *pdev)
drm_dev_unregister(ddev); drm_dev_unregister(ddev);
drm_kms_helper_poll_fini(ddev); drm_kms_helper_poll_fini(ddev);
free_irq(sdev->irq, ddev);
drm_dev_put(ddev); drm_dev_put(ddev);
} }
...@@ -277,8 +276,8 @@ static int shmob_drm_probe(struct platform_device *pdev) ...@@ -277,8 +276,8 @@ static int shmob_drm_probe(struct platform_device *pdev)
goto err_modeset_cleanup; goto err_modeset_cleanup;
sdev->irq = ret; sdev->irq = ret;
ret = request_irq(sdev->irq, shmob_drm_irq, 0, ddev->driver->name, ret = devm_request_irq(&pdev->dev, sdev->irq, shmob_drm_irq, 0,
ddev); ddev->driver->name, ddev);
if (ret < 0) { if (ret < 0) {
dev_err(&pdev->dev, "failed to install IRQ handler\n"); dev_err(&pdev->dev, "failed to install IRQ handler\n");
goto err_modeset_cleanup; goto err_modeset_cleanup;
...@@ -290,14 +289,12 @@ static int shmob_drm_probe(struct platform_device *pdev) ...@@ -290,14 +289,12 @@ static int shmob_drm_probe(struct platform_device *pdev)
*/ */
ret = drm_dev_register(ddev, 0); ret = drm_dev_register(ddev, 0);
if (ret < 0) if (ret < 0)
goto err_irq_uninstall; goto err_modeset_cleanup;
drm_fbdev_generic_setup(ddev, 16); drm_fbdev_generic_setup(ddev, 16);
return 0; return 0;
err_irq_uninstall:
free_irq(sdev->irq, ddev);
err_modeset_cleanup: err_modeset_cleanup:
drm_kms_helper_poll_fini(ddev); drm_kms_helper_poll_fini(ddev);
err_free_drm_dev: err_free_drm_dev:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment