Skip to content

Commit 8dc3f01

Browse files
Wer-Wolfij-intel
authored andcommitted
platform/x86: dell-ddv: Use devm_battery_hook_register
Use devm_battery_hook_register() instead of manually calling devm_add_action_or_reset() to simplify the code. Signed-off-by: Armin Wolf <[email protected]> Reviewed-by: Sebastian Reichel <[email protected]> Link: https://lore.kernel.org/r/[email protected] Reviewed-by: Ilpo Järvinen <[email protected]> Signed-off-by: Ilpo Järvinen <[email protected]>
1 parent 7a24829 commit 8dc3f01

File tree

1 file changed

+1
-10
lines changed

1 file changed

+1
-10
lines changed

drivers/platform/x86/dell/dell-wmi-ddv.c

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -732,13 +732,6 @@ static int dell_wmi_ddv_remove_battery(struct power_supply *battery, struct acpi
732732
return 0;
733733
}
734734

735-
static void dell_wmi_ddv_battery_remove(void *data)
736-
{
737-
struct acpi_battery_hook *hook = data;
738-
739-
battery_hook_unregister(hook);
740-
}
741-
742735
static int dell_wmi_ddv_battery_add(struct dell_wmi_ddv_data *data)
743736
{
744737
data->hook.name = "Dell DDV Battery Extension";
@@ -755,9 +748,7 @@ static int dell_wmi_ddv_battery_add(struct dell_wmi_ddv_data *data)
755748
data->eppid_attr.attr.mode = 0444;
756749
data->eppid_attr.show = eppid_show;
757750

758-
battery_hook_register(&data->hook);
759-
760-
return devm_add_action_or_reset(&data->wdev->dev, dell_wmi_ddv_battery_remove, &data->hook);
751+
return devm_battery_hook_register(&data->wdev->dev, &data->hook);
761752
}
762753

763754
static int dell_wmi_ddv_buffer_read(struct seq_file *seq, enum dell_ddv_method method)

0 commit comments

Comments
 (0)