From bbc9651fe9f4c081e9931e2b3f6a6c5b2d05a942 Mon Sep 17 00:00:00 2001 From: Matthew Auld Date: Wed, 22 May 2024 11:21:51 +0100 Subject: [PATCH] drm/xe/irq: move irq_uninstall over to devm Makes sense to trigger this when the device is removed. Signed-off-by: Matthew Auld Cc: Rodrigo Vivi Reviewed-by: Andrzej Hajda Link: https://patchwork.freedesktop.org/patch/msgid/20240522102143.128069-26-matthew.auld@intel.com --- drivers/gpu/drm/xe/xe_irq.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_irq.c b/drivers/gpu/drm/xe/xe_irq.c index 996806353171..8ee3c300c5e4 100644 --- a/drivers/gpu/drm/xe/xe_irq.c +++ b/drivers/gpu/drm/xe/xe_irq.c @@ -663,7 +663,7 @@ static irq_handler_t xe_irq_handler(struct xe_device *xe) return xelp_irq_handler; } -static void irq_uninstall(struct drm_device *drm, void *arg) +static void irq_uninstall(void *arg) { struct xe_device *xe = arg; struct pci_dev *pdev = to_pci_dev(xe->drm.dev); @@ -723,7 +723,7 @@ int xe_irq_install(struct xe_device *xe) xe_irq_postinstall(xe); - err = drmm_add_action_or_reset(&xe->drm, irq_uninstall, xe); + err = devm_add_action_or_reset(xe->drm.dev, irq_uninstall, xe); if (err) goto free_irq_handler; @@ -737,7 +737,7 @@ free_irq_handler: void xe_irq_shutdown(struct xe_device *xe) { - irq_uninstall(&xe->drm, xe); + irq_uninstall(xe); } void xe_irq_suspend(struct xe_device *xe) -- 2.42.0