Commit 7eae27cd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'backlight-next-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight 

Pull backlight updates from Lee Jones:
 "Fix-ups:
   - FB Backlight interaction overhaul
   - Remove superfluous code and simplify overall
   - Constify various structs and struct attributes

  Bug Fixes:
   - Repair LED flickering
   - Fix signedness bugs"

* tag 'backlight-next-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight: (42 commits)
  backlight: sky81452-backlight: Remove unnecessary call to of_node_get()
  backlight: mp3309c: Fix LEDs flickering in PWM mode
  backlight: otm3225a: Drop driver owner assignment
  backlight: lp8788: Drop support for platform data
  backlight: lcd: Make lcd_class constant
  backlight: Make backlight_class constant
  backlight: mp3309c: Fix signedness bug in mp3309c_parse_fwnode()
  const_structs.checkpatch: add lcd_ops
  fbdev: omap: lcd_ams_delta: Constify lcd_ops
  fbdev: imx: Constify lcd_ops
  fbdev: clps711x: Constify lcd_ops
  HID: picoLCD: Constify lcd_ops
  backlight: tdo24m: Constify lcd_ops
  backlight: platform_lcd: Constify lcd_ops
  backlight: otm3225a: Constify lcd_ops
  backlight: ltv350qv: Constify lcd_ops
  backlight: lms501kf03: Constify lcd_ops
  backlight: lms283gf05: Constify lcd_ops
  backlight: l4f00242t03: Constify lcd_ops
  backlight: jornada720_lcd: Constify lcd_ops
  ...
parents a85629f4 1fd949f6

drivers/auxdisplay/ht16k33.c

+1 −14
Original line number Diff line number Diff line
@@ -284,27 +284,14 @@ static int ht16k33_initialize(struct ht16k33_priv *priv) 


static int ht16k33_bl_update_status(struct backlight_device *bl)

{

	int brightness = bl->props.brightness;

	const int brightness = backlight_get_brightness(bl);

	struct ht16k33_priv *priv = bl_get_data(bl);



	if (bl->props.power != FB_BLANK_UNBLANK ||

	    bl->props.fb_blank != FB_BLANK_UNBLANK ||

	    bl->props.state & BL_CORE_FBBLANK)

		brightness = 0;



	return ht16k33_brightness_set(priv, brightness);

}



static int ht16k33_bl_check_fb(struct backlight_device *bl, struct fb_info *fi)

{

	struct ht16k33_priv *priv = bl_get_data(bl);



	return (fi == NULL) || (fi->par == priv);

}



static const struct backlight_ops ht16k33_bl_ops = {

	.update_status	= ht16k33_bl_update_status,

	.check_fb	= ht16k33_bl_check_fb,

};



/*

drivers/hid/hid-picolcd_backlight.c

+0 −7
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 


#include <linux/hid.h>



#include <linux/fb.h>

#include <linux/backlight.h>



#include "hid-picolcd.h"
@@ -39,15 +38,9 @@ static int picolcd_set_brightness(struct backlight_device *bdev) 
	return 0;

}



static int picolcd_check_bl_fb(struct backlight_device *bdev, struct fb_info *fb)

{

	return fb && fb == picolcd_fbinfo((struct picolcd_data *)bl_get_data(bdev));

}



static const struct backlight_ops picolcd_blops = {

	.update_status  = picolcd_set_brightness,

	.get_brightness = picolcd_get_brightness,

	.check_fb       = picolcd_check_bl_fb,

};



int picolcd_init_backlight(struct picolcd_data *data, struct hid_report *report)

drivers/hid/hid-picolcd_core.c

+7 −7
Original line number Diff line number Diff line
@@ -474,11 +474,6 @@ static int picolcd_probe_lcd(struct hid_device *hdev, struct picolcd_data *data) 
	if (error)

		goto err;



	/* Set up the framebuffer device */

	error = picolcd_init_framebuffer(data);

	if (error)

		goto err;



	/* Setup lcd class device */

	error = picolcd_init_lcd(data, picolcd_out_report(REPORT_CONTRAST, hdev));

	if (error)
@@ -489,6 +484,11 @@ static int picolcd_probe_lcd(struct hid_device *hdev, struct picolcd_data *data) 
	if (error)

		goto err;



	/* Set up the framebuffer device */

	error = picolcd_init_framebuffer(data);

	if (error)

		goto err;



	/* Setup the LED class devices */

	error = picolcd_init_leds(data, picolcd_out_report(REPORT_LED_STATE, hdev));

	if (error)
@@ -502,9 +502,9 @@ static int picolcd_probe_lcd(struct hid_device *hdev, struct picolcd_data *data) 
	return 0;

err:

	picolcd_exit_leds(data);

	picolcd_exit_framebuffer(data);

	picolcd_exit_backlight(data);

	picolcd_exit_lcd(data);

	picolcd_exit_framebuffer(data);

	picolcd_exit_cir(data);

	picolcd_exit_keys(data);

	return error;
@@ -623,9 +623,9 @@ static void picolcd_remove(struct hid_device *hdev) 
	/* Cleanup LED */

	picolcd_exit_leds(data);

	/* Clean up the framebuffer */

	picolcd_exit_framebuffer(data);

	picolcd_exit_backlight(data);

	picolcd_exit_lcd(data);

	picolcd_exit_framebuffer(data);

	/* Cleanup input */

	picolcd_exit_cir(data);

	picolcd_exit_keys(data);

drivers/hid/hid-picolcd_fb.c

+6 −0
Original line number Diff line number Diff line
@@ -491,6 +491,12 @@ int picolcd_init_framebuffer(struct picolcd_data *data) 
	info->fix = picolcdfb_fix;

	info->fix.smem_len   = PICOLCDFB_SIZE*8;



#ifdef CONFIG_FB_BACKLIGHT

#ifdef CONFIG_HID_PICOLCD_BACKLIGHT

	info->bl_dev = data->backlight;

#endif

#endif



	fbdata = info->par;

	spin_lock_init(&fbdata->lock);

	fbdata->picolcd = data;

drivers/hid/hid-picolcd_lcd.c

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ static int picolcd_check_lcd_fb(struct lcd_device *ldev, struct fb_info *fb) 
	return fb && fb == picolcd_fbinfo((struct picolcd_data *)lcd_get_data(ldev));

}



static struct lcd_ops picolcd_lcdops = {

static const struct lcd_ops picolcd_lcdops = {

	.get_contrast   = picolcd_get_contrast,

	.set_contrast   = picolcd_set_contrast,

	.check_fb       = picolcd_check_lcd_fb,