Commit 2fe83b3a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents dd6ccfe6 ce8c47cf

drivers/acpi/video.c

+2 −2
Original line number Diff line number Diff line
@@ -284,7 +284,7 @@ static int acpi_video_get_brightness(struct backlight_device *bd) 
{

	unsigned long cur_level;

	struct acpi_video_device *vd =

		(struct acpi_video_device *)class_get_devdata(&bd->class_dev);

		(struct acpi_video_device *)bl_get_data(bd);

	acpi_video_device_lcd_get_level_current(vd, &cur_level);

	return (int) cur_level;

}
@@ -293,7 +293,7 @@ static int acpi_video_set_brightness(struct backlight_device *bd) 
{

	int request_level = bd->props.brightness;

	struct acpi_video_device *vd =

		(struct acpi_video_device *)class_get_devdata(&bd->class_dev);

		(struct acpi_video_device *)bl_get_data(bd);

	acpi_video_device_lcd_set_level(vd, request_level);

	return 0;

}

drivers/usb/misc/appledisplay.c

+2 −2
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ static void appledisplay_complete(struct urb *urb) 


static int appledisplay_bl_update_status(struct backlight_device *bd)

{

	struct appledisplay *pdata = class_get_devdata(&bd->class_dev);

	struct appledisplay *pdata = bl_get_data(bd);

	int retval;



	pdata->msgdata[0] = 0x10;
@@ -159,7 +159,7 @@ static int appledisplay_bl_update_status(struct backlight_device *bd) 


static int appledisplay_bl_get_brightness(struct backlight_device *bd)

{

	struct appledisplay *pdata = class_get_devdata(&bd->class_dev);

	struct appledisplay *pdata = bl_get_data(bd);

	int retval;



	retval = usb_control_msg(

drivers/video/aty/aty128fb.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/video/aty/atyfb_base.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/video/aty/radeon_backlight.c

+2 −2
Original line number Diff line number Diff line
@@ -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;