drm/i915: reduce indent in i9xx_hpd_irq_handler

Bail out early if nothing to do. No functional changes.

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_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index e6bb72d..f0206f6 100644 (file)
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -1756,28 +1756,29 @@ static void i9xx_hpd_irq_handler(struct drm_device *dev)
        struct drm_i915_private *dev_priv = dev->dev_private;
        u32 hotplug_status = I915_READ(PORT_HOTPLUG_STAT);
 
-       if (hotplug_status) {
-               I915_WRITE(PORT_HOTPLUG_STAT, hotplug_status);
-               /*
-                * Make sure hotplug status is cleared before we clear IIR, or else we
-                * may miss hotplug events.
-                */
-               POSTING_READ(PORT_HOTPLUG_STAT);
+       if (!hotplug_status)
+               return;
 
-               if (IS_G4X(dev) || IS_VALLEYVIEW(dev)) {
-                       u32 hotplug_trigger = hotplug_status & HOTPLUG_INT_STATUS_G4X;
+       I915_WRITE(PORT_HOTPLUG_STAT, hotplug_status);
+       /*
+        * Make sure hotplug status is cleared before we clear IIR, or else we
+        * may miss hotplug events.
+        */
+       POSTING_READ(PORT_HOTPLUG_STAT);
 
-                       intel_hpd_irq_handler(dev, hotplug_trigger, 0, hpd_status_g4x);
-               } else {
-                       u32 hotplug_trigger = hotplug_status & HOTPLUG_INT_STATUS_I915;
+       if (IS_G4X(dev) || IS_VALLEYVIEW(dev)) {
+               u32 hotplug_trigger = hotplug_status & HOTPLUG_INT_STATUS_G4X;
 
-                       intel_hpd_irq_handler(dev, hotplug_trigger, 0, hpd_status_i915);
-               }
+               intel_hpd_irq_handler(dev, hotplug_trigger, 0, hpd_status_g4x);
+       } else {
+               u32 hotplug_trigger = hotplug_status & HOTPLUG_INT_STATUS_I915;
 
-               if ((IS_G4X(dev) || IS_VALLEYVIEW(dev)) &&
-                   hotplug_status & DP_AUX_CHANNEL_MASK_INT_STATUS_G4X)
-                       dp_aux_irq_handler(dev);
+               intel_hpd_irq_handler(dev, hotplug_trigger, 0, hpd_status_i915);
        }
+
+       if ((IS_G4X(dev) || IS_VALLEYVIEW(dev)) &&
+           hotplug_status & DP_AUX_CHANNEL_MASK_INT_STATUS_G4X)
+               dp_aux_irq_handler(dev);
 }
 
 static irqreturn_t valleyview_irq_handler(int irq, void *arg)