Commit ded8b07d authored by Chris Wilson's avatar Chris Wilson

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: default avatarChris 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.ukReviewed-by: default avatarMatthew Auld <matthew.auld@intel.com>
parent fb939420
...@@ -1556,7 +1556,7 @@ int i915_suspend_switcheroo(struct drm_device *dev, pm_message_t state) ...@@ -1556,7 +1556,7 @@ int i915_suspend_switcheroo(struct drm_device *dev, pm_message_t state)
{ {
int error; int error;
if (!dev || !dev->dev_private) { if (!dev) {
DRM_ERROR("dev: %p\n", dev); DRM_ERROR("dev: %p\n", dev);
DRM_ERROR("DRM not initialized, aborting suspend.\n"); DRM_ERROR("DRM not initialized, aborting suspend.\n");
return -ENODEV; return -ENODEV;
...@@ -1848,7 +1848,7 @@ static int i915_pm_suspend(struct device *dev) ...@@ -1848,7 +1848,7 @@ static int i915_pm_suspend(struct device *dev)
struct pci_dev *pdev = to_pci_dev(dev); struct pci_dev *pdev = to_pci_dev(dev);
struct drm_device *drm_dev = pci_get_drvdata(pdev); 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"); dev_err(dev, "DRM not initialized, aborting suspend.\n");
return -ENODEV; return -ENODEV;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment