Skip to content

Commit db63927

Browse files
committed
drm/i915: use pdev_to_i915() instead of pci_get_drvdata() directly
We have a helper for converting pci device to i915 device, use it. v2: Also convert i915_pci_probe() (Gustavo) Reviewed-by: Gustavo Sousa <[email protected]> Reviewed-by: Andi Shyti <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] Signed-off-by: Jani Nikula <[email protected]>
1 parent 9aec6f7 commit db63927

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

drivers/gpu/drm/i915/i915_pci.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -880,7 +880,7 @@ static void i915_pci_remove(struct pci_dev *pdev)
880880
{
881881
struct drm_i915_private *i915;
882882

883-
i915 = pci_get_drvdata(pdev);
883+
i915 = pdev_to_i915(pdev);
884884
if (!i915) /* driver load aborted, nothing to cleanup */
885885
return;
886886

@@ -1003,7 +1003,7 @@ static int i915_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
10031003
if (err)
10041004
return err;
10051005

1006-
if (i915_inject_probe_failure(pci_get_drvdata(pdev))) {
1006+
if (i915_inject_probe_failure(pdev_to_i915(pdev))) {
10071007
i915_pci_remove(pdev);
10081008
return -ENODEV;
10091009
}
@@ -1025,7 +1025,7 @@ static int i915_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
10251025

10261026
static void i915_pci_shutdown(struct pci_dev *pdev)
10271027
{
1028-
struct drm_i915_private *i915 = pci_get_drvdata(pdev);
1028+
struct drm_i915_private *i915 = pdev_to_i915(pdev);
10291029

10301030
i915_driver_shutdown(i915);
10311031
}

0 commit comments

Comments
 (0)