diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-07-03 11:31:01 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-07-03 11:31:01 -0700 |
| commit | 0a8d6c9c7128a93689fba384cdd7f72b0ce19abd (patch) | |
| tree | c8c1ecd4304a9d51b07a87353cd83b0eaf12f721 /drivers/video/backlight/adp8870_bl.c | |
| parent | c156d4af4354091c38a1cbef62c0b1574e8c4394 (diff) | |
| parent | a33677b9211b6c328ad359b072043af94f7c9592 (diff) | |
Merge tag 'backlight-next-6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight
Pull backlight updates from Lee Jones:
"New Functionality:
- Add lots of Device Tree bindings / support
- Turn off LED strings when display is blank
- Switch I2C drivers from .probe_new() to .probe()
- Remove superfluous NULL checks
- Only obtain PWM information once and do it in .probe()
Fix-ups:
- Ensure locks are obtained and held when required"
* tag 'backlight-next-6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight:
backlight: led_bl: Take led_access lock when required
video: backlight: lp855x: Get PWM for PWM mode during probe
dt-bindings: backlight: lp855x: Convert to YAML and modernize
dt-bindings: backlight: pwm: Make power-supply not required
backlight: pwm_bl: Remove unneeded checks for valid GPIOs
backlight: Switch i2c drivers back to use .probe()
backlight: lm3630a: Turn off both led strings when display is blank
dt-bindings: leds: backlight: ktz8866: Add reg property and update example
Diffstat (limited to 'drivers/video/backlight/adp8870_bl.c')
| -rw-r--r-- | drivers/video/backlight/adp8870_bl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/backlight/adp8870_bl.c b/drivers/video/backlight/adp8870_bl.c index d6b0007db649..6bb18dc970e9 100644 --- a/drivers/video/backlight/adp8870_bl.c +++ b/drivers/video/backlight/adp8870_bl.c @@ -973,8 +973,8 @@ static struct i2c_driver adp8870_driver = { .name = KBUILD_MODNAME, .pm = &adp8870_i2c_pm_ops, }, - .probe_new = adp8870_probe, - .remove = adp8870_remove, + .probe = adp8870_probe, + .remove = adp8870_remove, .id_table = adp8870_id, }; |