From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 19 Jan 2024 00:53:35 +0000 (-0800)
Subject: Merge tag 'backlight-next-6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/lee... 
X-Git-Tag: v6.8-rc1~41
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=21c91bb9367716f61f46a352aafdeda61cb91c73;p=linux-block.git

Merge tag 'backlight-next-6.8' of git://git./linux/kernel/git/lee/backlight

Pull backlight updates from Lee Jones:
 "New Drivers:
   - Add support for Monolithic Power Systems MP3309C WLED Step-up Converter

  Fix-ups:
   - Use/convert to new/better APIs/helpers/MACROs instead of
     hand-rolling implementations
   - Device Tree Binding updates
   - Demote non-kerneldoc header comments
   - Improve error handling; return proper error values, simplify, avoid
     duplicates, etc
   - Convert over to the new (kinda) GPIOD API

  Bug Fixes:
   - Fix uninitialised local variable"

* tag 'backlight-next-6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight:
  backlight: hx8357: Convert to agnostic GPIO API
  backlight: ili922x: Add an error code check in ili922x_write()
  backlight: ili922x: Drop kernel-doc for local macros
  backlight: mp3309c: Fix uninitialized local variable
  backlight: pwm_bl: Use dev_err_probe
  backlight: mp3309c: Add support for MPS MP3309C
  dt-bindings: backlight: mp3309c: Remove two required properties
---

21c91bb9367716f61f46a352aafdeda61cb91c73
diff --cc drivers/video/backlight/pwm_bl.c
index 35c716e9043c,5bc9c6c07571..ffcebf6aa76a
--- a/drivers/video/backlight/pwm_bl.c
+++ b/drivers/video/backlight/pwm_bl.c
@@@ -528,10 -530,10 +530,10 @@@ static int pwm_backlight_probe(struct p
  	if (!state.period && (data->pwm_period_ns > 0))
  		state.period = data->pwm_period_ns;
  
 -	ret = pwm_apply_state(pb->pwm, &state);
 +	ret = pwm_apply_might_sleep(pb->pwm, &state);
  	if (ret) {
- 		dev_err(&pdev->dev, "failed to apply initial PWM state: %d\n",
- 			ret);
+ 		dev_err_probe(&pdev->dev, ret,
+ 			      "failed to apply initial PWM state");
  		goto err_alloc;
  	}