Skip to content

Commit 46f538b

Browse files
committed
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
2 parents 8350e83 + 023a883 commit 46f538b

File tree

3 files changed

+9
-11
lines changed

3 files changed

+9
-11
lines changed

Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ properties:
2222
- qcom,pmi8994-wled
2323
- qcom,pmi8998-wled
2424
- qcom,pm660l-wled
25+
- qcom,pm6150l-wled
2526
- qcom,pm8150l-wled
2627

2728
reg:

drivers/video/backlight/backlight.c

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -710,8 +710,7 @@ static void devm_backlight_release(void *data)
710710
{
711711
struct backlight_device *bd = data;
712712

713-
if (bd)
714-
put_device(&bd->dev);
713+
put_device(&bd->dev);
715714
}
716715

717716
/**
@@ -737,11 +736,10 @@ struct backlight_device *devm_of_find_backlight(struct device *dev)
737736
bd = of_find_backlight(dev);
738737
if (IS_ERR_OR_NULL(bd))
739738
return bd;
740-
ret = devm_add_action(dev, devm_backlight_release, bd);
741-
if (ret) {
742-
put_device(&bd->dev);
739+
ret = devm_add_action_or_reset(dev, devm_backlight_release, bd);
740+
if (ret)
743741
return ERR_PTR(ret);
744-
}
742+
745743
return bd;
746744
}
747745
EXPORT_SYMBOL(devm_of_find_backlight);

drivers/video/backlight/pwm_bl.c

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -263,9 +263,8 @@ static int pwm_backlight_parse_dt(struct device *dev,
263263

264264
/* read brightness levels from DT property */
265265
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);
269268
if (!data->levels)
270269
return -ENOMEM;
271270

@@ -320,8 +319,8 @@ static int pwm_backlight_parse_dt(struct device *dev,
320319
* Create a new table of brightness levels with all the
321320
* interpolated steps.
322321
*/
323-
size = sizeof(*table) * num_levels;
324-
table = devm_kzalloc(dev, size, GFP_KERNEL);
322+
table = devm_kcalloc(dev, num_levels, sizeof(*table),
323+
GFP_KERNEL);
325324
if (!table)
326325
return -ENOMEM;
327326
/*

0 commit comments

Comments
 (0)