gma500: silence an unused variable warning
authorDan Carpenter <dan.carpenter@oracle.com>
Thu, 10 May 2012 07:33:02 +0000 (10:33 +0300)
committerDave Airlie <airlied@redhat.com>
Thu, 17 May 2012 10:15:23 +0000 (11:15 +0100)
If CONFIG_BACKLIGHT_CLASS_DEVICE is disabled then GCC warns that:
drivers/gpu/drm/gma500/opregion.c:154:6: warning:
unused variable ‘max’ [-Wunused-variable]

Which give me a chance to use the new config_enabled() macro.  :)

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Paul Menzel <paulepanter@users.sourceforge.net>
Acked-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
drivers/gpu/drm/gma500/opregion.c

index aa9e89f7e4c287c88a0f92c316e8323c3079703f..4f186eca3a3039dc804775a80e55f461c2ff7792 100644 (file)
@@ -149,7 +149,6 @@ static u32 asle_set_backlight(struct drm_device *dev, u32 bclp)
        struct drm_psb_private *dev_priv = dev->dev_private;
        struct opregion_asle *asle = dev_priv->opregion.asle;
        struct backlight_device *bd = dev_priv->backlight_device;
-       u32 max;
 
        DRM_DEBUG_DRIVER("asle set backlight %x\n", bclp);
 
@@ -163,11 +162,12 @@ static u32 asle_set_backlight(struct drm_device *dev, u32 bclp)
        if (bclp > 255)
                return ASLE_BACKLIGHT_FAILED;
 
-#ifdef CONFIG_BACKLIGHT_CLASS_DEVICE
-       max = bd->props.max_brightness;
-       bd->props.brightness = bclp * max / 255;
-       backlight_update_status(bd);
-#endif
+       if (config_enabled(CONFIG_BACKLIGHT_CLASS_DEVICE)) {
+               int max = bd->props.max_brightness;
+               bd->props.brightness = bclp * max / 255;
+               backlight_update_status(bd);
+       }
+
        asle->cblv = (bclp * 0x64) / 0xff | ASLE_CBLV_VALID;
 
        return 0;