mirror of
https://github.com/torvalds/linux.git
synced 2024-11-10 06:01:57 +00:00
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 <gustavo.sousa@intel.com> Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20240812103415.1540096-1-jani.nikula@intel.com Signed-off-by: Jani Nikula <jani.nikula@intel.com>
This commit is contained in:
parent
9aec6f76a2
commit
db639278e6
@ -880,7 +880,7 @@ static void i915_pci_remove(struct pci_dev *pdev)
|
||||
{
|
||||
struct drm_i915_private *i915;
|
||||
|
||||
i915 = pci_get_drvdata(pdev);
|
||||
i915 = pdev_to_i915(pdev);
|
||||
if (!i915) /* driver load aborted, nothing to cleanup */
|
||||
return;
|
||||
|
||||
@ -1003,7 +1003,7 @@ static int i915_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
if (i915_inject_probe_failure(pci_get_drvdata(pdev))) {
|
||||
if (i915_inject_probe_failure(pdev_to_i915(pdev))) {
|
||||
i915_pci_remove(pdev);
|
||||
return -ENODEV;
|
||||
}
|
||||
@ -1025,7 +1025,7 @@ static int i915_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
|
||||
|
||||
static void i915_pci_shutdown(struct pci_dev *pdev)
|
||||
{
|
||||
struct drm_i915_private *i915 = pci_get_drvdata(pdev);
|
||||
struct drm_i915_private *i915 = pdev_to_i915(pdev);
|
||||
|
||||
i915_driver_shutdown(i915);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user