From: Armin Wolf <W_Armin@gmx.de>
To: hdegoede@redhat.com, markgross@kernel.org
Cc: rafael@kernel.org, lenb@kernel.org, hmh@hmh.eng.br,
matan@svgalib.org, corentin.chary@gmail.com, jeremy@system76.com,
productdev@system76.com, platform-driver-x86@vger.kernel.org,
linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 1/5] ACPI: battery: Do not unload battery hooks on single error
Date: Mon, 12 Sep 2022 14:53:38 +0200 [thread overview]
Message-ID: <20220912125342.7395-2-W_Armin@gmx.de> (raw)
In-Reply-To: <20220912125342.7395-1-W_Armin@gmx.de>
Currently, battery hooks are being unloaded if they return
an error when adding a single battery.
This however also causes the removal of successfully added
hooks if they return -ENODEV for a single unsupported
battery.
Do not unload battery hooks in such cases since the hook
handles any cleanup actions.
Signed-off-by: Armin Wolf <W_Armin@gmx.de>
---
drivers/acpi/battery.c | 24 +++---------------------
1 file changed, 3 insertions(+), 21 deletions(-)
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index 306513fec1e1..e59c261c7c59 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -724,20 +724,10 @@ 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 a add-battery returns non-zero,
- * the registration of the extension has failed,
- * and we will not add it to the list of loaded
- * hooks.
- */
- pr_err("extension failed to load: %s", hook->name);
- __battery_hook_unregister(hook, 0);
- goto end;
- }
+ hook->add_battery(battery->bat);
}
pr_info("new extension: %s\n", hook->name);
-end:
+
mutex_unlock(&hook_mutex);
}
EXPORT_SYMBOL_GPL(battery_hook_register);
@@ -762,15 +752,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)) {
- /*
- * The notification of the extensions has failed, to
- * prevent further errors we will unload the extension.
- */
- pr_err("error in extension, unloading: %s",
- hook_node->name);
- __battery_hook_unregister(hook_node, 0);
- }
+ hook_node->add_battery(battery->bat);
}
mutex_unlock(&hook_mutex);
}
--
2.30.2
next prev parent reply other threads:[~2022-09-12 12:54 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-12 12:53 [PATCH 0/5] platform/x86: dell: Add new dell-wmi-ddv driver Armin Wolf
2022-09-12 12:53 ` Armin Wolf [this message]
2022-09-19 10:42 ` [PATCH 1/5] ACPI: battery: Do not unload battery hooks on single error Hans de Goede
2022-09-19 16:27 ` Rafael J. Wysocki
2022-09-19 19:12 ` Armin Wolf
2022-09-19 20:35 ` Armin Wolf
2022-09-27 14:29 ` Hans de Goede
2022-09-27 15:44 ` Armin Wolf
2022-09-12 12:53 ` [PATCH 2/5] ACPI: battery: Simplify battery_hook_unregister() Armin Wolf
2022-09-19 10:42 ` Hans de Goede
2022-09-12 12:53 ` [PATCH 3/5] ACPI: battery: Allow battery hooks to be registered multiple times Armin Wolf
2022-09-12 16:42 ` Barnabás Pőcze
2022-09-12 17:29 ` Armin Wolf
2022-09-19 11:18 ` Hans de Goede
2022-09-19 17:42 ` Barnabás Pőcze
2022-09-12 12:53 ` [PATCH 4/5] ACPI: battery: Allow for passing data to battery hooks Armin Wolf
2022-09-19 11:08 ` Hans de Goede
2022-09-12 12:53 ` [PATCH 5/5] platform/x86: dell: Add new dell-wmi-ddv driver Armin Wolf
2022-09-12 21:56 ` Randy Dunlap
2022-09-13 14:40 ` Armin Wolf
2022-09-13 16:08 ` Limonciello, Mario
2022-09-13 16:45 ` Armin Wolf
2022-09-13 18:27 ` Randy Dunlap
2022-09-13 18:30 ` Limonciello, Mario
2022-09-13 18:37 ` Randy Dunlap
2022-09-19 11:33 ` Hans de Goede
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220912125342.7395-2-W_Armin@gmx.de \
--to=w_armin@gmx.de \
--cc=corentin.chary@gmail.com \
--cc=hdegoede@redhat.com \
--cc=hmh@hmh.eng.br \
--cc=jeremy@system76.com \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=markgross@kernel.org \
--cc=matan@svgalib.org \
--cc=platform-driver-x86@vger.kernel.org \
--cc=productdev@system76.com \
--cc=rafael@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).