3 files changed, 25 insertions, 31 deletions

diff --git a/drivers/video/aty/aty128fb.c b/drivers/video/aty/aty128fb.c
index 4de8d6252c3..8726c366971 100644
--- a/drivers/video/aty/aty128fb.c
+++ b/drivers/video/aty/aty128fb.c
@@ -1695,8 +1695,6 @@ static int __devinit aty128fb_setup(char *options)
 #ifdef CONFIG_FB_ATY128_BACKLIGHT
 #define MAX_LEVEL 0xFF
 
-static struct backlight_properties aty128_bl_data;
-
 static int aty128_bl_get_level_brightness(struct aty128fb_par *par,
                 int level)
 {
@@ -1730,12 +1728,12 @@ static int aty128_bl_update_status(struct backlight_device *bd)
         unsigned int reg = aty_ld_le32(LVDS_GEN_CNTL);
         int level;
 
-        if (bd->props->power != FB_BLANK_UNBLANK ||
-            bd->props->fb_blank != FB_BLANK_UNBLANK ||
+        if (bd->props.power != FB_BLANK_UNBLANK ||
+            bd->props.fb_blank != FB_BLANK_UNBLANK ||
             !par->lcd_on)
                 level = 0;
         else
-                level = bd->props->brightness;
+                level = bd->props.brightness;
 
         reg |= LVDS_BL_MOD_EN | LVDS_BLON;
         if (level > 0) {
@@ -1779,19 +1777,18 @@ static int aty128_bl_update_status(struct backlight_device *bd)
 
 static int aty128_bl_get_brightness(struct backlight_device *bd)
 {
-        return bd->props->brightness;
+        return bd->props.brightness;
 }
 
-static struct backlight_properties aty128_bl_data = {
+static struct backlight_ops aty128_bl_data = {
         .get_brightness = aty128_bl_get_brightness,
         .update_status  = aty128_bl_update_status,
-        .max_brightness = (FB_BACKLIGHT_LEVELS - 1),
 };
 
 static void aty128_bl_set_power(struct fb_info *info, int power)
 {
         if (info->bl_dev) {
-                info->bl_dev->props->power = power;
+                info->bl_dev->props.power = power;
                 backlight_update_status(info->bl_dev);
         }
 }
@@ -1825,8 +1822,9 @@ static void aty128_bl_init(struct aty128fb_par *par)
                  63 * FB_BACKLIGHT_MAX / MAX_LEVEL,
                 219 * FB_BACKLIGHT_MAX / MAX_LEVEL);
 
-        bd->props->brightness = aty128_bl_data.max_brightness;
-        bd->props->power = FB_BLANK_UNBLANK;
+        bd->props.max_brightness = FB_BACKLIGHT_LEVELS - 1;
+        bd->props.brightness = bd->props.max_brightness;
+        bd->props.power = FB_BLANK_UNBLANK;
         backlight_update_status(bd);
 
         printk("aty128: Backlight initialized (%s)\n", name);
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
index 35ba2656759..a7e0062233f 100644
--- a/drivers/video/aty/atyfb_base.c
+++ b/drivers/video/aty/atyfb_base.c
@@ -2114,8 +2114,6 @@ static int atyfb_pci_resume(struct pci_dev *pdev)
 #ifdef CONFIG_FB_ATY_BACKLIGHT
 #define MAX_LEVEL 0xFF
 
-static struct backlight_properties aty_bl_data;
-
 static int aty_bl_get_level_brightness(struct atyfb_par *par, int level)
 {
         struct fb_info *info = pci_get_drvdata(par->pdev);
@@ -2139,11 +2137,11 @@ static int aty_bl_update_status(struct backlight_device *bd)
         unsigned int reg = aty_ld_lcd(LCD_MISC_CNTL, par);
         int level;
 
-        if (bd->props->power != FB_BLANK_UNBLANK ||
-            bd->props->fb_blank != FB_BLANK_UNBLANK)
+        if (bd->props.power != FB_BLANK_UNBLANK ||
+            bd->props.fb_blank != FB_BLANK_UNBLANK)
                 level = 0;
         else
-                level = bd->props->brightness;
+                level = bd->props.brightness;
 
         reg |= (BLMOD_EN | BIASMOD_EN);
         if (level > 0) {
@@ -2160,13 +2158,12 @@ static int aty_bl_update_status(struct backlight_device *bd)
 
 static int aty_bl_get_brightness(struct backlight_device *bd)
 {
-        return bd->props->brightness;
+        return bd->props.brightness;
 }
 
-static struct backlight_properties aty_bl_data = {
+static struct backlight_ops aty_bl_data = {
         .get_brightness = aty_bl_get_brightness,
         .update_status  = aty_bl_update_status,
-        .max_brightness = (FB_BACKLIGHT_LEVELS - 1),
 };
 
 static void aty_bl_init(struct atyfb_par *par)
@@ -2194,8 +2191,9 @@ static void aty_bl_init(struct atyfb_par *par)
                 0x3F * FB_BACKLIGHT_MAX / MAX_LEVEL,
                 0xFF * FB_BACKLIGHT_MAX / MAX_LEVEL);
 
-        bd->props->brightness = aty_bl_data.max_brightness;
-        bd->props->power = FB_BLANK_UNBLANK;
+        bd->props.max_brightness = FB_BACKLIGHT_LEVELS - 1;
+        bd->props.brightness = bd->props.max_brightness;
+        bd->props.power = FB_BLANK_UNBLANK;
         backlight_update_status(bd);
 
         printk("aty: Backlight initialized (%s)\n", name);
diff --git a/drivers/video/aty/radeon_backlight.c b/drivers/video/aty/radeon_backlight.c
index 8c775e6a7e0..0be25fa5540 100644
--- a/drivers/video/aty/radeon_backlight.c
+++ b/drivers/video/aty/radeon_backlight.c
@@ -19,8 +19,6 @@
 
 #define MAX_RADEON_LEVEL 0xFF
 
-static struct backlight_properties radeon_bl_data;
-
 struct radeon_bl_privdata {
         struct radeonfb_info *rinfo;
         uint8_t negative;
@@ -61,11 +59,11 @@ static int radeon_bl_update_status(struct backlight_device *bd)
          * backlight. This provides some greater power saving and the display
          * is useless without backlight anyway.
          */
-        if (bd->props->power != FB_BLANK_UNBLANK ||
-            bd->props->fb_blank != FB_BLANK_UNBLANK)
+        if (bd->props.power != FB_BLANK_UNBLANK ||
+            bd->props.fb_blank != FB_BLANK_UNBLANK)
                 level = 0;
         else
-                level = bd->props->brightness;
+                level = bd->props.brightness;
 
         del_timer_sync(&rinfo->lvds_timer);
         radeon_engine_idle();
@@ -126,13 +124,12 @@ static int radeon_bl_update_status(struct backlight_device *bd)
 
 static int radeon_bl_get_brightness(struct backlight_device *bd)
 {
-        return bd->props->brightness;
+        return bd->props.brightness;
 }
 
-static struct backlight_properties radeon_bl_data = {
+static struct backlight_ops radeon_bl_data = {
         .get_brightness = radeon_bl_get_brightness,
         .update_status  = radeon_bl_update_status,
-        .max_brightness = (FB_BACKLIGHT_LEVELS - 1),
 };
 
 void radeonfb_bl_init(struct radeonfb_info *rinfo)
@@ -188,8 +185,9 @@ void radeonfb_bl_init(struct radeonfb_info *rinfo)
                  63 * FB_BACKLIGHT_MAX / MAX_RADEON_LEVEL,
                 217 * FB_BACKLIGHT_MAX / MAX_RADEON_LEVEL);
 
-        bd->props->brightness = radeon_bl_data.max_brightness;
-        bd->props->power = FB_BLANK_UNBLANK;
+        bd->props.max_brightness = FB_BACKLIGHT_LEVELS - 1;
+        bd->props.brightness = bd->props.max_brightness;
+        bd->props.power = FB_BLANK_UNBLANK;
         backlight_update_status(bd);
 
         printk("radeonfb: Backlight initialized (%s)\n", name);