Skip to content

Commit 901500a

Browse files
committed
drm: renesas: shmobile: Convert to use devm_request_irq()
Convert to managed IRQ handling, to simplify cleanup. Reviewed-by: Laurent Pinchart <[email protected]> Signed-off-by: Geert Uytterhoeven <[email protected]> Link: https://lore.kernel.org/r/8d870bdc59dd5e2754542388a03095ea09c96297.1694767209.git.geert+renesas@glider.be
1 parent 95478b0 commit 901500a

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,6 @@ static void shmob_drm_remove(struct platform_device *pdev)
196196

197197
drm_dev_unregister(ddev);
198198
drm_kms_helper_poll_fini(ddev);
199-
free_irq(sdev->irq, ddev);
200199
drm_dev_put(ddev);
201200
}
202201

@@ -277,8 +276,8 @@ static int shmob_drm_probe(struct platform_device *pdev)
277276
goto err_modeset_cleanup;
278277
sdev->irq = ret;
279278

280-
ret = request_irq(sdev->irq, shmob_drm_irq, 0, ddev->driver->name,
281-
ddev);
279+
ret = devm_request_irq(&pdev->dev, sdev->irq, shmob_drm_irq, 0,
280+
ddev->driver->name, ddev);
282281
if (ret < 0) {
283282
dev_err(&pdev->dev, "failed to install IRQ handler\n");
284283
goto err_modeset_cleanup;
@@ -290,14 +289,12 @@ static int shmob_drm_probe(struct platform_device *pdev)
290289
*/
291290
ret = drm_dev_register(ddev, 0);
292291
if (ret < 0)
293-
goto err_irq_uninstall;
292+
goto err_modeset_cleanup;
294293

295294
drm_fbdev_generic_setup(ddev, 16);
296295

297296
return 0;
298297

299-
err_irq_uninstall:
300-
free_irq(sdev->irq, ddev);
301298
err_modeset_cleanup:
302299
drm_kms_helper_poll_fini(ddev);
303300
err_free_drm_dev:

0 commit comments

Comments
 (0)