aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/aty
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@rpsys.net>2007-07-09 07:17:24 -0400
committerRichard Purdie <rpurdie@rpsys.net>2007-07-15 20:20:23 -0400
commit655bfd7aebb12481ab9275284d9500bee5ba3e70 (patch)
tree54503eb59a03d94db77edca3388d36e3e5315dd8 /drivers/video/aty
parentfa9133c24c4115523c1381b67fdd74fd864ac0ea (diff)
backlight: Convert from struct class_device to struct device
Convert the backlight and LCD classes from struct class_device to struct device since class_device is scheduled for removal. One nasty API break is the backlight power attribute has had to be renamed to bl_power and the LCD power attribute has had to be renamed to lcd_power since the original names clash with the core. I can't see a way around this. Signed-off-by: Richard Purdie <rpurdie@rpsys.net> Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/video/aty')
-rw-r--r--drivers/video/aty/aty128fb.c2
-rw-r--r--drivers/video/aty/atyfb_base.c2
-rw-r--r--drivers/video/aty/radeon_backlight.c4
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,
1733 1733
1734static int aty128_bl_update_status(struct backlight_device *bd) 1734static int aty128_bl_update_status(struct backlight_device *bd)
1735{ 1735{
1736 struct aty128fb_par *par = class_get_devdata(&bd->class_dev); 1736 struct aty128fb_par *par = bl_get_data(bd);
1737 unsigned int reg = aty_ld_le32(LVDS_GEN_CNTL); 1737 unsigned int reg = aty_ld_le32(LVDS_GEN_CNTL);
1738 int level; 1738 int level;
1739 1739
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
index 2fbff6317433..d2c68c3d8d76 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)
2141 2141
2142static int aty_bl_update_status(struct backlight_device *bd) 2142static int aty_bl_update_status(struct backlight_device *bd)
2143{ 2143{
2144 struct atyfb_par *par = class_get_devdata(&bd->class_dev); 2144 struct atyfb_par *par = bl_get_data(bd);
2145 unsigned int reg = aty_ld_lcd(LCD_MISC_CNTL, par); 2145 unsigned int reg = aty_ld_lcd(LCD_MISC_CNTL, par);
2146 int level; 2146 int level;
2147 2147
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,
47 47
48static int radeon_bl_update_status(struct backlight_device *bd) 48static int radeon_bl_update_status(struct backlight_device *bd)
49{ 49{
50 struct radeon_bl_privdata *pdata = class_get_devdata(&bd->class_dev); 50 struct radeon_bl_privdata *pdata = bl_get_data(bd);
51 struct radeonfb_info *rinfo = pdata->rinfo; 51 struct radeonfb_info *rinfo = pdata->rinfo;
52 u32 lvds_gen_cntl, tmpPixclksCntl; 52 u32 lvds_gen_cntl, tmpPixclksCntl;
53 int level; 53 int level;
@@ -206,7 +206,7 @@ void radeonfb_bl_exit(struct radeonfb_info *rinfo)
206 if (bd) { 206 if (bd) {
207 struct radeon_bl_privdata *pdata; 207 struct radeon_bl_privdata *pdata;
208 208
209 pdata = class_get_devdata(&bd->class_dev); 209 pdata = bl_get_data(bd);
210 backlight_device_unregister(bd); 210 backlight_device_unregister(bd);
211 kfree(pdata); 211 kfree(pdata);
212 rinfo->info->bl_dev = NULL; 212 rinfo->info->bl_dev = NULL;