]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
platform/x86: dell-ddv: Use devm_battery_hook_register
authorArmin Wolf <W_Armin@gmx.de>
Wed, 5 Mar 2025 05:30:08 +0000 (06:30 +0100)
committerIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Fri, 7 Mar 2025 10:14:18 +0000 (12:14 +0200)
Use devm_battery_hook_register() instead of manually calling
devm_add_action_or_reset() to simplify the code.

Signed-off-by: Armin Wolf <W_Armin@gmx.de>
Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Link: https://lore.kernel.org/r/20250305053009.378609-3-W_Armin@gmx.de
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
drivers/platform/x86/dell/dell-wmi-ddv.c

index ab5f7d3ab824972b0e9bd11f9c3424546754a8ee..811cddab57fc179f24373ccab3c73b955921f396 100644 (file)
@@ -732,13 +732,6 @@ static int dell_wmi_ddv_remove_battery(struct power_supply *battery, struct acpi
        return 0;
 }
 
-static void dell_wmi_ddv_battery_remove(void *data)
-{
-       struct acpi_battery_hook *hook = data;
-
-       battery_hook_unregister(hook);
-}
-
 static int dell_wmi_ddv_battery_add(struct dell_wmi_ddv_data *data)
 {
        data->hook.name = "Dell DDV Battery Extension";
@@ -755,9 +748,7 @@ static int dell_wmi_ddv_battery_add(struct dell_wmi_ddv_data *data)
        data->eppid_attr.attr.mode = 0444;
        data->eppid_attr.show = eppid_show;
 
-       battery_hook_register(&data->hook);
-
-       return devm_add_action_or_reset(&data->wdev->dev, dell_wmi_ddv_battery_remove, &data->hook);
+       return devm_battery_hook_register(&data->wdev->dev, &data->hook);
 }
 
 static int dell_wmi_ddv_buffer_read(struct seq_file *seq, enum dell_ddv_method method)