ACPI: battery: Pass battery hook pointer to hook callbacks

Right now, is impossible for battery hook callbacks
to access instance-specific data, forcing most drivers
to provide some sort of global state. This however is
difficult for drivers which can be instantiated multiple
times and/or are hotplug-capable.

Pass a pointer to the battery hook to those callbacks
for usage with container_of().

Signed-off-by: Armin Wolf <W_Armin@gmx.de>
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Link: https://lore.kernel.org/r/20220927204521.601887-2-W_Armin@gmx.de
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>

diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index 306513fec1e1f71ca0c0bb0464d44e4fb3926967..9482b0b6eadc47e1eca06e0b09ca680434d2764b 100644 (file)
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -696,7 +696,7 @@ static void __battery_hook_unregister(struct acpi_battery_hook *hook, int lock)
        if (lock)
                mutex_lock(&hook_mutex);
        list_for_each_entry(battery, &acpi_battery_list, list) {
-               hook->remove_battery(battery->bat);
+               hook->remove_battery(battery->bat, hook);
        }
        list_del(&hook->list);
        if (lock)
@@ -724,7 +724,7 @@ void battery_hook_register(struct acpi_battery_hook *hook)
         * its attributes.
         */
        list_for_each_entry(battery, &acpi_battery_list, list) {
-               if (hook->add_battery(battery->bat)) {
+               if (hook->add_battery(battery->bat, hook)) {
                        /*
                         * If a add-battery returns non-zero,
                         * the registration of the extension has failed,
@@ -762,7 +762,7 @@ static void battery_hook_add_battery(struct acpi_battery *battery)
         * during the battery module initialization.
         */
        list_for_each_entry_safe(hook_node, tmp, &battery_hook_list, list) {
-               if (hook_node->add_battery(battery->bat)) {
+               if (hook_node->add_battery(battery->bat, hook_node)) {
                        /*
                         * The notification of the extensions has failed, to
                         * prevent further errors we will unload the extension.
@@ -785,7 +785,7 @@ static void battery_hook_remove_battery(struct acpi_battery *battery)
         * custom attributes from the battery.
         */
        list_for_each_entry(hook, &battery_hook_list, list) {
-               hook->remove_battery(battery->bat);
+               hook->remove_battery(battery->bat, hook);
        }
        /* Then, just remove the battery from the list */
        list_del(&battery->list);

diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
index 872efc1d5b36b1b5ee5963197fae4c8bdf1624bd..6f81b2844dcbea2789faea6e4dc821ad6847ed12 100644 (file)
--- a/drivers/platform/x86/asus-wmi.c
+++ b/drivers/platform/x86/asus-wmi.c
@@ -883,7 +883,7 @@ static ssize_t charge_control_end_threshold_show(struct device *device,
 
 static DEVICE_ATTR_RW(charge_control_end_threshold);
 
-static int asus_wmi_battery_add(struct power_supply *battery)
+static int asus_wmi_battery_add(struct power_supply *battery, struct acpi_battery_hook *hook)
 {
        /* The WMI method does not provide a way to specific a battery, so we
         * just assume it is the first battery.
@@ -910,7 +910,7 @@ static int asus_wmi_battery_add(struct power_supply *battery)
        return 0;
 }
 
-static int asus_wmi_battery_remove(struct power_supply *battery)
+static int asus_wmi_battery_remove(struct power_supply *battery, struct acpi_battery_hook *hook)
 {
        device_remove_file(&battery->dev,
                           &dev_attr_charge_control_end_threshold);

diff --git a/drivers/platform/x86/huawei-wmi.c b/drivers/platform/x86/huawei-wmi.c
index 5873c2663a65b0704bd9912529a1928354353ed1..415ccb3a95decdfbc4c3f03257a6329599158ca7 100644 (file)
--- a/drivers/platform/x86/huawei-wmi.c
+++ b/drivers/platform/x86/huawei-wmi.c
@@ -468,7 +468,7 @@ static DEVICE_ATTR_RW(charge_control_start_threshold);
 static DEVICE_ATTR_RW(charge_control_end_threshold);
 static DEVICE_ATTR_RW(charge_control_thresholds);
 
-static int huawei_wmi_battery_add(struct power_supply *battery)
+static int huawei_wmi_battery_add(struct power_supply *battery, struct acpi_battery_hook *hook)
 {
        int err = 0;
 
@@ -483,7 +483,7 @@ static int huawei_wmi_battery_add(struct power_supply *battery)
        return err;
 }
 
-static int huawei_wmi_battery_remove(struct power_supply *battery)
+static int huawei_wmi_battery_remove(struct power_supply *battery, struct acpi_battery_hook *hook)
 {
        device_remove_file(&battery->dev, &dev_attr_charge_control_start_threshold);
        device_remove_file(&battery->dev, &dev_attr_charge_control_end_threshold);

diff --git a/drivers/platform/x86/lg-laptop.c b/drivers/platform/x86/lg-laptop.c
index 332868b140ed5844d4e4e7aaf066188bacfaab2e..d662b64b0ba986ba70fb007e0548d8979ef72dfe 100644 (file)
--- a/drivers/platform/x86/lg-laptop.c
+++ b/drivers/platform/x86/lg-laptop.c
@@ -546,7 +546,7 @@ static DEVICE_ATTR_RW(fn_lock);
 static DEVICE_ATTR_RW(charge_control_end_threshold);
 static DEVICE_ATTR_RW(battery_care_limit);
 
-static int lg_battery_add(struct power_supply *battery)
+static int lg_battery_add(struct power_supply *battery, struct acpi_battery_hook *hook)
 {
        if (device_create_file(&battery->dev,
                               &dev_attr_charge_control_end_threshold))
@@ -555,7 +555,7 @@ static int lg_battery_add(struct power_supply *battery)
        return 0;
 }
 
-static int lg_battery_remove(struct power_supply *battery)
+static int lg_battery_remove(struct power_supply *battery, struct acpi_battery_hook *hook)
 {
        device_remove_file(&battery->dev,
                           &dev_attr_charge_control_end_threshold);

diff --git a/drivers/platform/x86/system76_acpi.c b/drivers/platform/x86/system76_acpi.c
index 958df41ad5098d12c95dac664f862253980bd6bf..9031bd53253fb192092841ade8802ec6997cb22b 100644 (file)
--- a/drivers/platform/x86/system76_acpi.c
+++ b/drivers/platform/x86/system76_acpi.c
@@ -254,7 +254,7 @@ static struct attribute *system76_battery_attrs[] = {
 
 ATTRIBUTE_GROUPS(system76_battery);
 
-static int system76_battery_add(struct power_supply *battery)
+static int system76_battery_add(struct power_supply *battery, struct acpi_battery_hook *hook)
 {
        // System76 EC only supports 1 battery
        if (strcmp(battery->desc->name, "BAT0") != 0)
@@ -266,7 +266,7 @@ static int system76_battery_add(struct power_supply *battery)
        return 0;
 }
 
-static int system76_battery_remove(struct power_supply *battery)
+static int system76_battery_remove(struct power_supply *battery, struct acpi_battery_hook *hook)
 {
        device_remove_groups(&battery->dev, system76_battery_groups);
        return 0;

diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index 8476dfef4e626c3fed72ca1c27e98ec751fdb30a..4b12808bddabbb9c9b7efa0be76c07a393363170 100644 (file)
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -9907,7 +9907,7 @@ ATTRIBUTE_GROUPS(tpacpi_battery);
 
 /* ACPI battery hooking */
 
-static int tpacpi_battery_add(struct power_supply *battery)
+static int tpacpi_battery_add(struct power_supply *battery, struct acpi_battery_hook *hook)
 {
        int batteryid = tpacpi_battery_get_id(battery->desc->name);
 
@@ -9918,7 +9918,7 @@ static int tpacpi_battery_add(struct power_supply *battery)
        return 0;
 }
 
-static int tpacpi_battery_remove(struct power_supply *battery)
+static int tpacpi_battery_remove(struct power_supply *battery, struct acpi_battery_hook *hook)
 {
        device_remove_groups(&battery->dev, tpacpi_battery_groups);
        return 0;

diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c
index 160abd3b3af8be37b2abf7018e53d552e20c7591..13628d41799a2638694e595e1ef2f175b74637c4 100644 (file)
--- a/drivers/platform/x86/toshiba_acpi.c
+++ b/drivers/platform/x86/toshiba_acpi.c
@@ -3113,7 +3113,7 @@ static struct attribute *toshiba_acpi_battery_attrs[] = {
 
 ATTRIBUTE_GROUPS(toshiba_acpi_battery);
 
-static int toshiba_acpi_battery_add(struct power_supply *battery)
+static int toshiba_acpi_battery_add(struct power_supply *battery, struct acpi_battery_hook *hook)
 {
        if (toshiba_acpi == NULL) {
                pr_err("Init order issue\n");
@@ -3126,7 +3126,7 @@ static int toshiba_acpi_battery_add(struct power_supply *battery)
        return 0;
 }
 
-static int toshiba_acpi_battery_remove(struct power_supply *battery)
+static int toshiba_acpi_battery_remove(struct power_supply *battery, struct acpi_battery_hook *hook)
 {
        device_remove_groups(&battery->dev, toshiba_acpi_battery_groups);
        return 0;

diff --git a/include/acpi/battery.h b/include/acpi/battery.h
index b8d56b702c7a8a2b594c75593cb1c35c71b44992..611a2561a014f6409f83b026f9aa7af9d017460f 100644 (file)
--- a/include/acpi/battery.h
+++ b/include/acpi/battery.h
@@ -12,8 +12,8 @@
 
 struct acpi_battery_hook {
        const char *name;
-       int (*add_battery)(struct power_supply *battery);
-       int (*remove_battery)(struct power_supply *battery);
+       int (*add_battery)(struct power_supply *battery, struct acpi_battery_hook *hook);
+       int (*remove_battery)(struct power_supply *battery, struct acpi_battery_hook *hook);
        struct list_head list;
 };