]> git.baikalelectronics.ru Git - kernel.git/commitdiff
drm/i915: Use dev_get_drvdata
authorChuhong Yuan <hslester96@gmail.com>
Tue, 23 Jul 2019 10:39:16 +0000 (18:39 +0800)
committerChris Wilson <chris@chris-wilson.co.uk>
Tue, 23 Jul 2019 16:55:08 +0000 (17:55 +0100)
Instead of using to_pci_dev + pci_get_drvdata,
use dev_get_drvdata to make code simpler.

Signed-off-by: Chuhong Yuan <hslester96@gmail.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190723103915.3964-1-hslester96@gmail.com
drivers/gpu/drm/i915/i915_drv.c

index 8c81a35f832d70b5775f42fbf984a1ea7b2c04a1..7d081315014655ac93ac2594c45829038b6950ca 100644 (file)
@@ -2395,8 +2395,7 @@ static int i915_resume_switcheroo(struct drm_device *dev)
 
 static int i915_pm_prepare(struct device *kdev)
 {
-       struct pci_dev *pdev = to_pci_dev(kdev);
-       struct drm_device *dev = pci_get_drvdata(pdev);
+       struct drm_device *dev = dev_get_drvdata(kdev);
 
        if (!dev) {
                dev_err(kdev, "DRM not initialized, aborting suspend.\n");
@@ -2411,8 +2410,7 @@ static int i915_pm_prepare(struct device *kdev)
 
 static int i915_pm_suspend(struct device *kdev)
 {
-       struct pci_dev *pdev = to_pci_dev(kdev);
-       struct drm_device *dev = pci_get_drvdata(pdev);
+       struct drm_device *dev = dev_get_drvdata(kdev);
 
        if (!dev) {
                dev_err(kdev, "DRM not initialized, aborting suspend.\n");
@@ -2906,8 +2904,7 @@ static int vlv_resume_prepare(struct drm_i915_private *dev_priv,
 
 static int intel_runtime_suspend(struct device *kdev)
 {
-       struct pci_dev *pdev = to_pci_dev(kdev);
-       struct drm_device *dev = pci_get_drvdata(pdev);
+       struct drm_device *dev = dev_get_drvdata(kdev);
        struct drm_i915_private *dev_priv = to_i915(dev);
        struct intel_runtime_pm *rpm = &dev_priv->runtime_pm;
        int ret;
@@ -3005,8 +3002,7 @@ static int intel_runtime_suspend(struct device *kdev)
 
 static int intel_runtime_resume(struct device *kdev)
 {
-       struct pci_dev *pdev = to_pci_dev(kdev);
-       struct drm_device *dev = pci_get_drvdata(pdev);
+       struct drm_device *dev = dev_get_drvdata(kdev);
        struct drm_i915_private *dev_priv = to_i915(dev);
        struct intel_runtime_pm *rpm = &dev_priv->runtime_pm;
        int ret = 0;