diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2016-07-05 10:40:22 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2016-07-05 11:53:50 +0100 |
| commit | ded8b07d4c2827811215d92be4c97426ce7f1999 (patch) | |
| tree | f2d706a194bfeda782c47079fc846af93352f89a /drivers/gpu | |
| parent | fb93942033dfe7b4b87bba516f9b551da0bac970 (diff) | |
| download | talos-op-linux-ded8b07d4c2827811215d92be4c97426ce7f1999.tar.gz talos-op-linux-ded8b07d4c2827811215d92be4c97426ce7f1999.zip | |
drm/i915: Remove impossible tests for dev->dev_private
If we have a drm_device, we have a drm_i915_private (since they are the
same).
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Imre Deak <imre.deak@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1467711623-2905-3-git-send-email-chris@chris-wilson.co.uk
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index fa72b73cb180..595029bc55a3 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -1556,7 +1556,7 @@ int i915_suspend_switcheroo(struct drm_device *dev, pm_message_t state) { int error; - if (!dev || !dev->dev_private) { + if (!dev) { DRM_ERROR("dev: %p\n", dev); DRM_ERROR("DRM not initialized, aborting suspend.\n"); return -ENODEV; @@ -1848,7 +1848,7 @@ static int i915_pm_suspend(struct device *dev) struct pci_dev *pdev = to_pci_dev(dev); struct drm_device *drm_dev = pci_get_drvdata(pdev); - if (!drm_dev || !drm_dev->dev_private) { + if (!drm_dev) { dev_err(dev, "DRM not initialized, aborting suspend.\n"); return -ENODEV; } |
