From: Imre Deak Date: Wed, 10 Sep 2014 15:16:55 +0000 (+0300) Subject: drm/i915: remove dead code from legacy suspend handler X-Git-Tag: v3.19-rc1~73^2~78^2~33 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=0b14cbd2f58199a024acbe2994bb27533c97d756;p=~emulex%2Finfiniband.git drm/i915: remove dead code from legacy suspend handler The legacy DRM suspend logic (effective in UMS) doesn't handle any S4 thaw events so we don't need to care about it either. Only S3 suspend and S4 freeze events are handled. Leave an assert behind to be sure. Signed-off-by: Imre Deak Reviewed-by: Ville Syrjälä Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index a05a1d083e9..f7bc3e980d8 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -640,9 +640,9 @@ int i915_suspend(struct drm_device *dev, pm_message_t state) return -ENODEV; } - if (state.event == PM_EVENT_PRETHAW) - return 0; - + if (WARN_ON_ONCE(state.event != PM_EVENT_SUSPEND && + state.event != PM_EVENT_FREEZE)) + return -EINVAL; if (dev->switch_power_state == DRM_SWITCH_POWER_OFF) return 0;