| Message ID | 20230415160734.70475-6-hdegoede@redhat.com |
|---|---|
| State | Accepted |
| Commit | 1269774ac3c8b5845ce12cb686165f3e4850b91e |
| Headers | show |
| Series | power: supply: Fix external_power_changed race in several drivers | expand |
On 15/04/2023 18:07, Hans de Goede wrote: > max17042_external_power_changed() is a wrapper around > "power_supply_changed(psy);" and it has the same prototype. > > Remove it, replacing it with making the external_power_changed > callback directly point to power_supply_changed. Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Best regards, Krzysztof
diff --git a/drivers/power/supply/max17042_battery.c b/drivers/power/supply/max17042_battery.c index 89cabe8ed3b0..6a2d00d95a39 100644 --- a/drivers/power/supply/max17042_battery.c +++ b/drivers/power/supply/max17042_battery.c @@ -499,11 +499,6 @@ static int max17042_property_is_writeable(struct power_supply *psy, return ret; } -static void max17042_external_power_changed(struct power_supply *psy) -{ - power_supply_changed(psy); -} - static int max17042_write_verify_reg(struct regmap *map, u8 reg, u32 value) { int retries = 8; @@ -1016,7 +1011,7 @@ static const struct power_supply_desc max17042_psy_desc = { .get_property = max17042_get_property, .set_property = max17042_set_property, .property_is_writeable = max17042_property_is_writeable, - .external_power_changed = max17042_external_power_changed, + .external_power_changed = power_supply_changed, .properties = max17042_battery_props, .num_properties = ARRAY_SIZE(max17042_battery_props), };
max17042_external_power_changed() is a wrapper around "power_supply_changed(psy);" and it has the same prototype. Remove it, replacing it with making the external_power_changed callback directly point to power_supply_changed. Cc: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Cc: Marek Szyprowski <m.szyprowski@samsung.com> Cc: Sebastian Krzyszkowiak <sebastian.krzyszkowiak@puri.sm> Cc: Purism Kernel Team <kernel@puri.sm> Signed-off-by: Hans de Goede <hdegoede@redhat.com> --- drivers/power/supply/max17042_battery.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)