| Message ID | 20241205-power-supply-extensions-v5-1-f0f996db4347@weissschuh.net (mailing list archive) |
|---|---|
| State | In Next |
| Delegated to: | Rafael Wysocki |
| Headers | show |
| Series | power: supply: extension API | expand |
Hi, On Thu, Dec 05, 2024 at 09:46:35PM +0100, Thomas Weißschuh wrote: > This functionality is called "hook" everywhere in the code. > For consistency call it the same in the log messages. > > The power supply subsystem is about to get its own extension > functionality. While the two are closely related and will be used > together, the current wording leaves room for misinterpretation. > > Signed-off-by: Thomas Weißschuh <linux@weissschuh.net> > > --- > This patch can also be applied independently through the ACPI tree. > --- Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.com> -- Sebastian > drivers/acpi/battery.c | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) > > diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c > index 3d5342f8d7b3ae4e259131f9c7b7144a6206cfdb..6760330a8af55d51c82a0447623c2040ffdaab10 100644 > --- a/drivers/acpi/battery.c > +++ b/drivers/acpi/battery.c > @@ -717,7 +717,7 @@ static void battery_hook_unregister_unlocked(struct acpi_battery_hook *hook) > } > list_del_init(&hook->list); > > - pr_info("extension unregistered: %s\n", hook->name); > + pr_info("hook unregistered: %s\n", hook->name); > } > > void battery_hook_unregister(struct acpi_battery_hook *hook) > @@ -751,18 +751,18 @@ void battery_hook_register(struct acpi_battery_hook *hook) > if (hook->add_battery(battery->bat, hook)) { > /* > * If a add-battery returns non-zero, > - * the registration of the extension has failed, > + * the registration of the hook has failed, > * and we will not add it to the list of loaded > * hooks. > */ > - pr_err("extension failed to load: %s", hook->name); > + pr_err("hook failed to load: %s", hook->name); > battery_hook_unregister_unlocked(hook); > goto end; > } > > power_supply_changed(battery->bat); > } > - pr_info("new extension: %s\n", hook->name); > + pr_info("new hook: %s\n", hook->name); > end: > mutex_unlock(&hook_mutex); > } > @@ -805,10 +805,10 @@ static void battery_hook_add_battery(struct acpi_battery *battery) > list_for_each_entry_safe(hook_node, tmp, &battery_hook_list, list) { > 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. > + * The notification of the hook has failed, to > + * prevent further errors we will unload the hook. > */ > - pr_err("error in extension, unloading: %s", > + pr_err("error in hook, unloading: %s", > hook_node->name); > battery_hook_unregister_unlocked(hook_node); > } > > -- > 2.47.1 >
On Fri, Dec 6, 2024 at 1:40 AM Sebastian Reichel <sebastian.reichel@collabora.com> wrote: > > Hi, > > On Thu, Dec 05, 2024 at 09:46:35PM +0100, Thomas Weißschuh wrote: > > This functionality is called "hook" everywhere in the code. > > For consistency call it the same in the log messages. > > > > The power supply subsystem is about to get its own extension > > functionality. While the two are closely related and will be used > > together, the current wording leaves room for misinterpretation. > > > > Signed-off-by: Thomas Weißschuh <linux@weissschuh.net> > > > > --- > > This patch can also be applied independently through the ACPI tree. > > --- > > Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.com> Applied as 6.14 material, thanks! > > drivers/acpi/battery.c | 14 +++++++------- > > 1 file changed, 7 insertions(+), 7 deletions(-) > > > > diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c > > index 3d5342f8d7b3ae4e259131f9c7b7144a6206cfdb..6760330a8af55d51c82a0447623c2040ffdaab10 100644 > > --- a/drivers/acpi/battery.c > > +++ b/drivers/acpi/battery.c > > @@ -717,7 +717,7 @@ static void battery_hook_unregister_unlocked(struct acpi_battery_hook *hook) > > } > > list_del_init(&hook->list); > > > > - pr_info("extension unregistered: %s\n", hook->name); > > + pr_info("hook unregistered: %s\n", hook->name); > > } > > > > void battery_hook_unregister(struct acpi_battery_hook *hook) > > @@ -751,18 +751,18 @@ void battery_hook_register(struct acpi_battery_hook *hook) > > if (hook->add_battery(battery->bat, hook)) { > > /* > > * If a add-battery returns non-zero, > > - * the registration of the extension has failed, > > + * the registration of the hook has failed, > > * and we will not add it to the list of loaded > > * hooks. > > */ > > - pr_err("extension failed to load: %s", hook->name); > > + pr_err("hook failed to load: %s", hook->name); > > battery_hook_unregister_unlocked(hook); > > goto end; > > } > > > > power_supply_changed(battery->bat); > > } > > - pr_info("new extension: %s\n", hook->name); > > + pr_info("new hook: %s\n", hook->name); > > end: > > mutex_unlock(&hook_mutex); > > } > > @@ -805,10 +805,10 @@ static void battery_hook_add_battery(struct acpi_battery *battery) > > list_for_each_entry_safe(hook_node, tmp, &battery_hook_list, list) { > > 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. > > + * The notification of the hook has failed, to > > + * prevent further errors we will unload the hook. > > */ > > - pr_err("error in extension, unloading: %s", > > + pr_err("error in hook, unloading: %s", > > hook_node->name); > > battery_hook_unregister_unlocked(hook_node); > > } > > > > -- > > 2.47.1 > >
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c index 3d5342f8d7b3ae4e259131f9c7b7144a6206cfdb..6760330a8af55d51c82a0447623c2040ffdaab10 100644 --- a/drivers/acpi/battery.c +++ b/drivers/acpi/battery.c @@ -717,7 +717,7 @@ static void battery_hook_unregister_unlocked(struct acpi_battery_hook *hook) } list_del_init(&hook->list); - pr_info("extension unregistered: %s\n", hook->name); + pr_info("hook unregistered: %s\n", hook->name); } void battery_hook_unregister(struct acpi_battery_hook *hook) @@ -751,18 +751,18 @@ void battery_hook_register(struct acpi_battery_hook *hook) if (hook->add_battery(battery->bat, hook)) { /* * If a add-battery returns non-zero, - * the registration of the extension has failed, + * the registration of the hook has failed, * and we will not add it to the list of loaded * hooks. */ - pr_err("extension failed to load: %s", hook->name); + pr_err("hook failed to load: %s", hook->name); battery_hook_unregister_unlocked(hook); goto end; } power_supply_changed(battery->bat); } - pr_info("new extension: %s\n", hook->name); + pr_info("new hook: %s\n", hook->name); end: mutex_unlock(&hook_mutex); } @@ -805,10 +805,10 @@ static void battery_hook_add_battery(struct acpi_battery *battery) list_for_each_entry_safe(hook_node, tmp, &battery_hook_list, list) { 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. + * The notification of the hook has failed, to + * prevent further errors we will unload the hook. */ - pr_err("error in extension, unloading: %s", + pr_err("error in hook, unloading: %s", hook_node->name); battery_hook_unregister_unlocked(hook_node); }
This functionality is called "hook" everywhere in the code. For consistency call it the same in the log messages. The power supply subsystem is about to get its own extension functionality. While the two are closely related and will be used together, the current wording leaves room for misinterpretation. Signed-off-by: Thomas Weißschuh <linux@weissschuh.net> --- This patch can also be applied independently through the ACPI tree. --- drivers/acpi/battery.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)