drm/i915: Use 'enabled' instead of 'enable' consistently in sprite WM code
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Tue, 6 Aug 2013 19:24:00 +0000 (22:24 +0300)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Thu, 8 Aug 2013 12:04:52 +0000 (14:04 +0200)
Let's be consistent and always call our variables 'enabled' insted of
the occasional 'enable'.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
[danvet: Spelling fix in the commit message, spotted by Chris.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/intel_pm.c

index c20d68298072db499a06f8f484dd1ffaa11816af..6761717fe3357b1a078dc3df5f19506e6afa6cb9 100644 (file)
@@ -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 *