On Mon, 12 Aug 2024, Jani Nikula <jani.nikula@xxxxxxxxx> wrote:
> 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@xxxxxxxxx>
> Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx>
Pushed to din, thanks for the reviews.
BR,
Jani.
> ---
> drivers/gpu/drm/i915/i915_pci.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
> index ce4dfd65fafa..94c89ca2ef30 100644
> --- a/drivers/gpu/drm/i915/i915_pci.c
> +++ b/drivers/gpu/drm/i915/i915_pci.c
> @@ -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);
> }
--
Jani Nikula, Intel
