Instead of using to_pci_dev + pci_get_drvdata,
use dev_get_drvdata to make code simpler.

Signed-off-by: Chuhong Yuan <hsleste...@gmail.com>
---
 drivers/gpu/drm/i915/i915_drv.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index f62e3397d936..2a677c89641d 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -2384,8 +2384,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");
@@ -2400,8 +2399,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");
@@ -2895,8 +2893,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;
@@ -2994,8 +2991,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;
-- 
2.20.1

Reply via email to