From: Ville Syrjälä Date: Tue, 6 Aug 2013 19:24:00 +0000 (+0300) Subject: drm/i915: Use 'enabled' instead of 'enable' consistently in sprite WM code X-Git-Tag: firefly_0821_release~176^2~5263^2~73^2~29 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=39db4a4d7f9b2809141e5bc0e06f7a5b7daeb356;p=firefly-linux-kernel-4.4.55.git drm/i915: Use 'enabled' instead of 'enable' consistently in sprite WM code Let's be consistent and always call our variables 'enabled' insted of the occasional 'enable'. Signed-off-by: Ville Syrjälä [danvet: Spelling fix in the commit message, spotted by Chris.] Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index c20d68298072..6761717fe335 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -2838,7 +2838,7 @@ sandybridge_compute_sprite_srwm(struct drm_device *dev, int plane, static void sandybridge_update_sprite_wm(struct drm_device *dev, int pipe, uint32_t sprite_width, int pixel_size, - bool enable, bool scaled) + bool enabled, bool scaled) { struct drm_i915_private *dev_priv = dev->dev_private; int latency = dev_priv->wm.spr_latency[0] * 100; /* In unit 0.1us */ @@ -2846,7 +2846,7 @@ static void sandybridge_update_sprite_wm(struct drm_device *dev, int pipe, int sprite_wm, reg; int ret; - if (!enable) + if (!enabled) return; switch (pipe) { @@ -2961,13 +2961,13 @@ void intel_update_watermarks(struct drm_device *dev) void intel_update_sprite_watermarks(struct drm_device *dev, int pipe, uint32_t sprite_width, int pixel_size, - bool enable, bool scaled) + bool enabled, bool scaled) { struct drm_i915_private *dev_priv = dev->dev_private; if (dev_priv->display.update_sprite_wm) dev_priv->display.update_sprite_wm(dev, pipe, sprite_width, - pixel_size, enable, scaled); + pixel_size, enabled, scaled); } static struct drm_i915_gem_object *