- Add support for PM6150L to Qualcomm WLED
 
  - Fix-ups
    - Use kcalloc() to avoid open-coding; pwm_bl
    - Device Tree changes (inc. YAML conversion); qcom-wled
    - Cleanup or simplify code; backlight
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEdrbJNaO+IJqU8IdIUa+KL4f8d2EFAmI9oGMACgkQUa+KL4f8
 d2Hqdg/+LwaX/4RobWLvHUBKFjn7A1QOkmwXTqWoUt3lhuq/nRlRdVSCGTsfT/UH
 5hT3T8iotg4bfD/CXVmEqcEvDq1jD6ouvTjq0s4HFj9rcqtKeqkCgWGOPGG7TAQo
 FVzNBmHYX63SwOXXupS3kVRbVVZQH4MhwQPJ5jLcv620UfydnidEHdqP4dQ8QVLD
 sCFXcPu63yPZMRL5eILtz7hkAjRdIociLOFsQCJOHVkyy+yJKQ5r6gqJK4LMdXyC
 dPdy6QAZ46kTfLSWSXv9v1iNVDmwXAHDAovqBJO09CyVwe12fpJM1Bi0M/clZ7px
 uVdedCr8z+0wBuh1um7hh+sZpi6s3/wBMHvNWztCZmjR8fmSHGdGviwrb566xsmI
 5MwrhqrJ/j/gi8Jk0LMb60G4TMtbAlQyrT3Im16eklazOJ6fnwbJdssx/f/ho3HO
 g4P8fOI5Ew1toyDDlTAikYdXcNaMAUQ3W688/loWD8eg97ZAOqX3U2vt4r6QY8f+
 XO/hEXP83BYABxz9ZgZJARnoEVFKHLALk1Oa94dguRMJlHrawI8gG2QshNRyalIg
 wdDIGSWjBNUvLogCZGZbGYWeAIXtTHn8E2e2xRnpG9lJib0d2VYqdOsum/3Z3+im
 nwSZ6GwDmZWkFmzrVrrDekrinVitjGX2rGJjpgxCNTZjSm7JEcY=
 =Kvqi
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2022-03-25 14:01:23 -07:00
Родитель 8350e8331b 023a8830a6
Коммит 46f538bf24
3 изменённых файлов: 9 добавлений и 11 удалений

Просмотреть файл

@ -22,6 +22,7 @@ properties:
- qcom,pmi8994-wled
- qcom,pmi8998-wled
- qcom,pm660l-wled
- qcom,pm6150l-wled
- qcom,pm8150l-wled
reg:

Просмотреть файл

@ -710,8 +710,7 @@ static void devm_backlight_release(void *data)
{
struct backlight_device *bd = data;
if (bd)
put_device(&bd->dev);
put_device(&bd->dev);
}
/**
@ -737,11 +736,10 @@ struct backlight_device *devm_of_find_backlight(struct device *dev)
bd = of_find_backlight(dev);
if (IS_ERR_OR_NULL(bd))
return bd;
ret = devm_add_action(dev, devm_backlight_release, bd);
if (ret) {
put_device(&bd->dev);
ret = devm_add_action_or_reset(dev, devm_backlight_release, bd);
if (ret)
return ERR_PTR(ret);
}
return bd;
}
EXPORT_SYMBOL(devm_of_find_backlight);

Просмотреть файл

@ -263,9 +263,8 @@ static int pwm_backlight_parse_dt(struct device *dev,
/* read brightness levels from DT property */
if (num_levels > 0) {
size_t size = sizeof(*data->levels) * num_levels;
data->levels = devm_kzalloc(dev, size, GFP_KERNEL);
data->levels = devm_kcalloc(dev, num_levels,
sizeof(*data->levels), GFP_KERNEL);
if (!data->levels)
return -ENOMEM;
@ -320,8 +319,8 @@ static int pwm_backlight_parse_dt(struct device *dev,
* Create a new table of brightness levels with all the
* interpolated steps.
*/
size = sizeof(*table) * num_levels;
table = devm_kzalloc(dev, size, GFP_KERNEL);
table = devm_kcalloc(dev, num_levels, sizeof(*table),
GFP_KERNEL);
if (!table)
return -ENOMEM;
/*