On Mon, 2 Jul 2012 11:51:06 -0300 Eugeni Dodonov <eugeni.dodonov at intel.com> wrote: > Just a cosmetic change to simplify the if statement. > > Signed-off-by: Eugeni Dodonov <eugeni.dodonov at intel.com> Reviewed-by: Ben Widawsky <ben at bwidawsk.net> > --- > drivers/gpu/drm/i915/intel_pm.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c > index a3ee1b1..64cd97e 100644 > --- a/drivers/gpu/drm/i915/intel_pm.c > +++ b/drivers/gpu/drm/i915/intel_pm.c > @@ -3238,7 +3238,7 @@ void intel_disable_gt_powersave(struct drm_device *dev) > { > if (IS_IRONLAKE_M(dev)) > ironlake_disable_drps(dev); > - if (INTEL_INFO(dev)->gen >= 6 && !IS_VALLEYVIEW(dev)) > + else if (INTEL_INFO(dev)->gen >= 6 && !IS_VALLEYVIEW(dev)) > gen6_disable_rps(dev); > } > > @@ -3248,9 +3248,7 @@ void intel_enable_gt_powersave(struct drm_device *dev) > ironlake_enable_drps(dev); > ironlake_enable_rc6(dev); > intel_init_emon(dev); > - } > - > - if ((IS_GEN6(dev) || IS_GEN7(dev)) && !IS_VALLEYVIEW(dev)) { > + } else if ((IS_GEN6(dev) || IS_GEN7(dev)) && !IS_VALLEYVIEW(dev)) { > gen6_enable_rps(dev); > gen6_update_ring_freq(dev); > } -- Ben Widawsky, Intel Open Source Technology Center