Re: [PATCH 2/6] drm/i915: remove superfluous checks for pdev->msi_enabled

[Michał Grzelak]

On Mon, 15 Jun 2026, Jani Nikula wrote:

pci_disable_msi() checks for pdev->msi_enabled internally. There's no
need to peek at pdev internals in i915. Remove them.

Signed-off-by: Jani Nikula <jani.nik...@intel.com>

Reviewed-by: Michał Grzelak <michal.grze...@intel.com>

BR,
Michał

---
drivers/gpu/drm/i915/i915_driver.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_driver.c 
b/drivers/gpu/drm/i915/i915_driver.c
index a69eb3a84005..d1d3f039483f 100644
--- a/drivers/gpu/drm/i915/i915_driver.c
+++ b/drivers/gpu/drm/i915/i915_driver.c
@@ -583,8 +583,7 @@ static int i915_driver_hw_probe(struct drm_i915_private 
*dev_priv)

err_opregion:
        intel_opregion_cleanup(display);
-       if (pdev->msi_enabled)
-               pci_disable_msi(pdev);
+       pci_disable_msi(pdev);
err_mem_regions:
        intel_memory_regions_driver_release(dev_priv);
err_ggtt:
@@ -610,8 +609,7 @@ static void i915_driver_hw_remove(struct drm_i915_private 
*dev_priv)

        intel_opregion_cleanup(display);

-       if (pdev->msi_enabled)
-               pci_disable_msi(pdev);
+       pci_disable_msi(pdev);
}

/**
--
2.47.3