[ Sasha's backport helper bot ]
Hi,
The upstream commit SHA1 provided is correct: c382e2e3eccb6b7ca8c7aff5092c1668428e7de6
WARNING: Author mismatch between patch and upstream commit: Backport author: bin.lan.cn@eng.windriver.com Commit author: George Stark gnstark@salutedevices.com
Status in newer kernel trees: 6.12.y | Present (exact SHA1) 6.6.y | Present (different SHA1: 3ead19aa341d) 6.1.y | Not found
Note: The patch differs from the upstream commit: --- 1: c382e2e3eccb6 ! 1: c7a5b2d87541f leds: an30259a: Use devm_mutex_init() for mutex initialization @@ Metadata ## Commit message ## leds: an30259a: Use devm_mutex_init() for mutex initialization
+ [ Upstream commit c382e2e3eccb6b7ca8c7aff5092c1668428e7de6 ] + In this driver LEDs are registered using devm_led_classdev_register() so they are automatically unregistered after module's remove() is done. led_classdev_unregister() calls module's led_set_brightness() to turn off @@ Commit message Reviewed-by: Andy Shevchenko andy.shevchenko@gmail.com Link: https://lore.kernel.org/r/20240411161032.609544-9-gnstark@salutedevices.com Signed-off-by: Lee Jones lee@kernel.org + [ Resolve merge conflict in drivers/leds/leds-an30259a.c ] + Signed-off-by: Bin Lan bin.lan.cn@windriver.com
## drivers/leds/leds-an30259a.c ## @@ drivers/leds/leds-an30259a.c: static int an30259a_probe(struct i2c_client *client) @@ drivers/leds/leds-an30259a.c: static int an30259a_probe(struct i2c_client *clien { .compatible = "panasonic,an30259a", }, { /* sentinel */ }, @@ drivers/leds/leds-an30259a.c: static struct i2c_driver an30259a_driver = { - .of_match_table = an30259a_match_table, + .of_match_table = of_match_ptr(an30259a_match_table), }, - .probe = an30259a_probe, + .probe_new = an30259a_probe, - .remove = an30259a_remove, .id_table = an30259a_id, }; ---
Results of testing on various branches:
| Branch | Patch Apply | Build Test | |---------------------------|-------------|------------| | stable/linux-6.1.y | Success | Success |