Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight

* 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight:
  leds: cr_bllcd.c: build fix
  backlight: Convert from struct class_device to struct device
  backlight: Fix order of Kconfig entries

3 files changed, 4 insertions, 4 deletions

diff --git a/drivers/video/aty/aty128fb.c b/drivers/video/aty/aty128fb.c
index 7fea4d8ae8e2..cfcbe37d2d70 100644
--- a/drivers/video/aty/aty128fb.c
+++ b/drivers/video/aty/aty128fb.c
@@ -1733,7 +1733,7 @@ static int aty128_bl_get_level_brightness(struct aty128fb_par *par,
 
 static int aty128_bl_update_status(struct backlight_device *bd)
 {
-        struct aty128fb_par *par = class_get_devdata(&bd->class_dev);
+        struct aty128fb_par *par = bl_get_data(bd);
         unsigned int reg = aty_ld_le32(LVDS_GEN_CNTL);
         int level;
 
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
index 13990697b5c1..bc6f0096aa04 100644
--- a/drivers/video/aty/atyfb_base.c
+++ b/drivers/video/aty/atyfb_base.c
@@ -2141,7 +2141,7 @@ static int aty_bl_get_level_brightness(struct atyfb_par *par, int level)
 
 static int aty_bl_update_status(struct backlight_device *bd)
 {
-        struct atyfb_par *par = class_get_devdata(&bd->class_dev);
+        struct atyfb_par *par = bl_get_data(bd);
         unsigned int reg = aty_ld_lcd(LCD_MISC_CNTL, par);
         int level;
 
diff --git a/drivers/video/aty/radeon_backlight.c b/drivers/video/aty/radeon_backlight.c
index 0be25fa5540c..1a056adb61c8 100644
--- a/drivers/video/aty/radeon_backlight.c
+++ b/drivers/video/aty/radeon_backlight.c
@@ -47,7 +47,7 @@ static int radeon_bl_get_level_brightness(struct radeon_bl_privdata *pdata,
 
 static int radeon_bl_update_status(struct backlight_device *bd)
 {
-        struct radeon_bl_privdata *pdata = class_get_devdata(&bd->class_dev);
+        struct radeon_bl_privdata *pdata = bl_get_data(bd);
         struct radeonfb_info *rinfo = pdata->rinfo;
         u32 lvds_gen_cntl, tmpPixclksCntl;
         int level;
@@ -206,7 +206,7 @@ void radeonfb_bl_exit(struct radeonfb_info *rinfo)
         if (bd) {
                 struct radeon_bl_privdata *pdata;
 
-                pdata = class_get_devdata(&bd->class_dev);
+                pdata = bl_get_data(bd);
                 backlight_device_unregister(bd);
                 kfree(pdata);
                 rinfo->info->bl_dev = NULL;