Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'backlight-next-5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight
Pull backlight updates from Lee Jones:
"New Device Support:
- Add support for PM6150L to Qualcomm WLED
Fix-ups"
- Use kcalloc() to avoid open-coding; pwm_bl
- Device Tree changes; qcom-wled
- Cleanup or simplify code; backlight"
* tag 'backlight-next-5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight:
backlight: backlight: Slighly simplify devm_of_find_backlight()
backlight: qcom-wled: Add PM6150L compatible
dt-bindings: backlight: qcom-wled: Add PM6150L compatible
backlight: pwm_bl: Avoid open coded arithmetic in memory allocation
+9
-11
+1
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml
+1
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml
+4
-6
drivers/video/backlight/backlight.c
+4
-6
drivers/video/backlight/backlight.c
···
710
710
{
711
711
struct backlight_device *bd = data;
712
712
713
-
if (bd)
714
-
put_device(&bd->dev);
713
+
put_device(&bd->dev);
715
714
}
716
715
717
716
/**
···
736
737
bd = of_find_backlight(dev);
737
738
if (IS_ERR_OR_NULL(bd))
738
739
return bd;
739
-
ret = devm_add_action(dev, devm_backlight_release, bd);
740
-
if (ret) {
741
-
put_device(&bd->dev);
740
+
ret = devm_add_action_or_reset(dev, devm_backlight_release, bd);
741
+
if (ret)
742
742
return ERR_PTR(ret);
743
-
}
743
+
744
744
return bd;
745
745
}
746
746
EXPORT_SYMBOL(devm_of_find_backlight);
+4
-5
drivers/video/backlight/pwm_bl.c
+4
-5
drivers/video/backlight/pwm_bl.c
···
263
263
264
264
/* read brightness levels from DT property */
265
265
if (num_levels > 0) {
266
-
size_t size = sizeof(*data->levels) * num_levels;
267
-
268
-
data->levels = devm_kzalloc(dev, size, GFP_KERNEL);
266
+
data->levels = devm_kcalloc(dev, num_levels,
267
+
sizeof(*data->levels), GFP_KERNEL);
269
268
if (!data->levels)
270
269
return -ENOMEM;
271
270
···
319
320
* Create a new table of brightness levels with all the
320
321
* interpolated steps.
321
322
*/
322
-
size = sizeof(*table) * num_levels;
323
-
table = devm_kzalloc(dev, size, GFP_KERNEL);
323
+
table = devm_kcalloc(dev, num_levels, sizeof(*table),
324
+
GFP_KERNEL);
324
325
if (!table)
325
326
return -ENOMEM;
326
327
/*