Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4e46aa08 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:
  backlight: mbp_nvidia_bl - add two more MacBookPro variants
  backlight: Pass device through notify callback in the pwm driver
  backlight: PTR_ERR return of wrong pointer in cr_backlight_probe()
  backlight: Constify struct backlight_ops
  backlight/thinkpad-acpi: issue backlight class events

Fix up trivial conflicts in thinkpad-acpi support (backlight support
already merged earlier).
parents 9209e4bd f7a297af

drivers/video/backlight/adp5520_bl.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -85,7 +85,7 @@ static int adp5520_bl_get_brightness(struct backlight_device *bl) 
	return error ? data->current_brightness : reg_val;

	return error ? data->current_brightness : reg_val;

}

}





static struct backlight_ops adp5520_bl_ops = {

static const struct backlight_ops adp5520_bl_ops = {

	.update_status	= adp5520_bl_update_status,

	.update_status	= adp5520_bl_update_status,

	.get_brightness	= adp5520_bl_get_brightness,

	.get_brightness	= adp5520_bl_get_brightness,

};

};

drivers/video/backlight/adx_bl.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -61,7 +61,7 @@ static int adx_backlight_check_fb(struct fb_info *fb) 
	return 1;

	return 1;

}

}





static struct backlight_ops adx_backlight_ops = {

static const struct backlight_ops adx_backlight_ops = {

	.options = 0,

	.options = 0,

	.update_status = adx_backlight_update_status,

	.update_status = adx_backlight_update_status,

	.get_brightness = adx_backlight_get_brightness,

	.get_brightness = adx_backlight_get_brightness,

drivers/video/backlight/atmel-pwm-bl.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -113,7 +113,7 @@ static int atmel_pwm_bl_init_pwm(struct atmel_pwm_bl *pwmbl) 
	return pwm_channel_enable(&pwmbl->pwmc);

	return pwm_channel_enable(&pwmbl->pwmc);

}

}





static struct backlight_ops atmel_pwm_bl_ops = {

static const struct backlight_ops atmel_pwm_bl_ops = {

	.get_brightness = atmel_pwm_bl_get_intensity,

	.get_brightness = atmel_pwm_bl_get_intensity,

	.update_status  = atmel_pwm_bl_set_intensity,

	.update_status  = atmel_pwm_bl_set_intensity,

};

};

drivers/video/backlight/backlight.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -269,7 +269,7 @@ EXPORT_SYMBOL(backlight_force_update); 
 * ERR_PTR() or a pointer to the newly allocated device.

 * ERR_PTR() or a pointer to the newly allocated device.

 */

 */

struct backlight_device *backlight_device_register(const char *name,

struct backlight_device *backlight_device_register(const char *name,

		struct device *parent, void *devdata, struct backlight_ops *ops)

		struct device *parent, void *devdata, const struct backlight_ops *ops)

{

{

	struct backlight_device *new_bd;

	struct backlight_device *new_bd;

	int rc;

	int rc;

drivers/video/backlight/corgi_lcd.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -451,7 +451,7 @@ void corgi_lcd_limit_intensity(int limit) 
}

}

EXPORT_SYMBOL(corgi_lcd_limit_intensity);

EXPORT_SYMBOL(corgi_lcd_limit_intensity);





static struct backlight_ops corgi_bl_ops = {

static const struct backlight_ops corgi_bl_ops = {

	.get_brightness	= corgi_bl_get_intensity,

	.get_brightness	= corgi_bl_get_intensity,

	.update_status  = corgi_bl_update_status,

	.update_status  = corgi_bl_update_status,

};

};