From: Ville Syrjälä Date: Wed, 13 Apr 2016 18:19:53 +0000 (+0300) Subject: drm/i915: Move variables to narrower scope in VLV/CHV irq handlers X-Git-Tag: MMI-PSA29.97-13-9~7427^2~45^2~269 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6e814800a232afdee3f8abf5b9d49829015c67a7;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git drm/i915: Move variables to narrower scope in VLV/CHV irq handlers Signed-off-by: Ville Syrjälä Link: http://patchwork.freedesktop.org/patch/msgid/1460571598-24452-8-git-send-email-ville.syrjala@linux.intel.com Reviewed-by: Chris Wilson --- diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index 948849639021..e6dcc47fc37c 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -1768,7 +1768,6 @@ static irqreturn_t valleyview_irq_handler(int irq, void *arg) { struct drm_device *dev = arg; struct drm_i915_private *dev_priv = dev->dev_private; - u32 iir, gt_iir, pm_iir; irqreturn_t ret = IRQ_NONE; if (!intel_irqs_enabled(dev_priv)) @@ -1778,6 +1777,7 @@ static irqreturn_t valleyview_irq_handler(int irq, void *arg) disable_rpm_wakeref_asserts(dev_priv); do { + u32 iir, gt_iir, pm_iir; u32 ier = 0; gt_iir = I915_READ(GTIIR); @@ -1844,7 +1844,6 @@ static irqreturn_t cherryview_irq_handler(int irq, void *arg) { struct drm_device *dev = arg; struct drm_i915_private *dev_priv = dev->dev_private; - u32 master_ctl, iir; irqreturn_t ret = IRQ_NONE; if (!intel_irqs_enabled(dev_priv)) @@ -1854,6 +1853,7 @@ static irqreturn_t cherryview_irq_handler(int irq, void *arg) disable_rpm_wakeref_asserts(dev_priv); do { + u32 master_ctl, iir; u32 ier = 0; master_ctl = I915_READ(GEN8_MASTER_IRQ) & ~GEN8_MASTER_IRQ_CONTROL;