drm/xe/irq: move irq_uninstall over to devm

Makes sense to trigger this when the device is removed.

Signed-off-by: Matthew Auld <[email protected]>
Cc: Rodrigo Vivi <[email protected]>
Reviewed-by: Andrzej Hajda <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]

diff --git a/drivers/gpu/drm/xe/xe_irq.c b/drivers/gpu/drm/xe/xe_irq.c
index 996806353171b31cea04a052999174fb94612187..8ee3c300c5e4b3dd96eed74a9b0c6b5cd7761630 100644 (file)
--- 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)