drm/i915: remove the unnecessary block around display.hpd_irq_setup

The block was added for spin_lock_irqsave flags, but since the locking
was converted to spin_lock_irq variant, the block is no longer needed.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 2404b2baa01ed74f8974ee36195a507406eab050..122ea9549110ff44cb410ca429d861ca21f41403 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -703,12 +703,10 @@ static int i915_drm_resume(struct drm_device *dev)
 
                intel_modeset_init_hw(dev);
 
-               {
-                       spin_lock_irq(&dev_priv->irq_lock);
-                       if (dev_priv->display.hpd_irq_setup)
-                               dev_priv->display.hpd_irq_setup(dev);
-                       spin_unlock_irq(&dev_priv->irq_lock);
-               }
+               spin_lock_irq(&dev_priv->irq_lock);
+               if (dev_priv->display.hpd_irq_setup)
+                       dev_priv->display.hpd_irq_setup(dev);
+               spin_unlock_irq(&dev_priv->irq_lock);
 
                intel_dp_mst_resume(dev);
                drm_modeset_lock_all(dev);