summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Auld <matthew.auld@intel.com>2024-05-22 11:21:51 +0100
committerMatthew Auld <matthew.auld@intel.com>2024-05-22 13:22:39 +0100
commitbbc9651fe9f4c081e9931e2b3f6a6c5b2d05a942 (patch)
treea146a8244a7dfd7cd63807a0c6869bff3d7299a7
parent6d95155ae71963ebf43a8df60f39704294f09dae (diff)
drm/xe/irq: move irq_uninstall over to devm
Makes sense to trigger this when the device is removed. Signed-off-by: Matthew Auld <matthew.auld@intel.com> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> Reviewed-by: Andrzej Hajda <andrzej.hajda@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20240522102143.128069-26-matthew.auld@intel.com
-rw-r--r--drivers/gpu/drm/xe/xe_irq.c6
1 files 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)