Skip to content

Commit

Permalink
drm/xe/irq: move irq_uninstall over to devm
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Matthew Auld committed May 22, 2024
1 parent 6d95155 commit bbc9651
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/gpu/drm/xe/xe_irq.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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;

Expand All @@ -737,7 +737,7 @@ int xe_irq_install(struct xe_device *xe)

void xe_irq_shutdown(struct xe_device *xe)
{
irq_uninstall(&xe->drm, xe);
irq_uninstall(xe);
}

void xe_irq_suspend(struct xe_device *xe)
Expand Down

0 comments on commit bbc9651

Please sign in to comment.