From: Ville Syrjälä <ville.syrjala@linux.intel.com>
Date: Mon, 19 Jan 2015 11:50:52 +0000 (+0200)
Subject: drm/i915: Rename 'reg' to 'clk_reg' to unconfuse it from the other 'reg'
X-Git-Tag: omap-for-v4.1/prcm-dts-mfd-syscon-fix~75^2~8^2~92
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f78ae63f28c3f7de06360c553711fb07abd69734;p=pandora-kernel.git

drm/i915: Rename 'reg' to 'clk_reg' to unconfuse it from the other 'reg'

On VLV/CHV the rc6 residency calculations read a second register to
determine the actual units used for the residency value. The variable
name 'reg' where that register value is stored shadows the function
argument 'reg'. That can easily leave the reader utterly confused, so
rename the internal variable to 'clk_reg'.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Deepak S<deepak.s@intel.com>
[danvet: Spellfix in commit message.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---

Reading git-diff-tree failed