From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Wed, 8 Dec 2010 13:31:49 +0000 (+0000)
Subject: drm/i915: driver.suspend and .resume are always set
X-Git-Tag: v2.6.38-rc1~419^2~23^2~21
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4a19d02e0a8cd8799e5d150d8eb74861e1a4cdec;p=karo-tx-linux.git

drm/i915: driver.suspend and .resume are always set

So we can remove the repeated initialisation.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 91a3ad2cf942..ad28b21f4d03 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -700,11 +700,6 @@ static int __init i915_init(void)
 		driver.driver_features &= ~DRIVER_MODESET;
 #endif
 
-	if (!(driver.driver_features & DRIVER_MODESET)) {
-		driver.suspend = i915_suspend;
-		driver.resume = i915_resume;
-	}
-
 	return drm_init(&driver);
 }