ACPI: power: Use str_on_off() helper function

[PATCH] ACPI: power: Use str_on_off() helper function

Posted by Thorsten Blum 12 months ago

Remove hard-coded strings by using the str_on_off() helper function.

Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>
---
 drivers/acpi/power.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c
index 25174c24d3d7..b7243d7563b1 100644
--- a/drivers/acpi/power.c
+++ b/drivers/acpi/power.c
@@ -29,6 +29,7 @@
 #include <linux/init.h>
 #include <linux/types.h>
 #include <linux/slab.h>
+#include <linux/string_choices.h>
 #include <linux/pm_runtime.h>
 #include <linux/sysfs.h>
 #include <linux/acpi.h>
@@ -197,7 +198,7 @@ static int __get_state(acpi_handle handle, u8 *state)
 	cur_state = sta & ACPI_POWER_RESOURCE_STATE_ON;
 
 	acpi_handle_debug(handle, "Power resource is %s\n",
-			  cur_state ? "on" : "off");
+			  str_on_off(cur_state));
 
 	*state = cur_state;
 	return 0;
@@ -240,7 +241,7 @@ static int acpi_power_get_list_state(struct list_head *list, u8 *state)
 			break;
 	}
 
-	pr_debug("Power resource list is %s\n", cur_state ? "on" : "off");
+	pr_debug("Power resource list is %s\n", str_on_off(cur_state));
 
 	*state = cur_state;
 	return 0;
-- 
2.48.1

Re: [PATCH] ACPI: power: Use str_on_off() helper function

Posted by Rafael J. Wysocki 11 months, 3 weeks ago

On Sun, Feb 9, 2025 at 11:08 PM Thorsten Blum <thorsten.blum@linux.dev> wrote:
>
> Remove hard-coded strings by using the str_on_off() helper function.
>
> Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>
> ---
>  drivers/acpi/power.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c
> index 25174c24d3d7..b7243d7563b1 100644
> --- a/drivers/acpi/power.c
> +++ b/drivers/acpi/power.c
> @@ -29,6 +29,7 @@
>  #include <linux/init.h>
>  #include <linux/types.h>
>  #include <linux/slab.h>
> +#include <linux/string_choices.h>
>  #include <linux/pm_runtime.h>
>  #include <linux/sysfs.h>
>  #include <linux/acpi.h>
> @@ -197,7 +198,7 @@ static int __get_state(acpi_handle handle, u8 *state)
>         cur_state = sta & ACPI_POWER_RESOURCE_STATE_ON;
>
>         acpi_handle_debug(handle, "Power resource is %s\n",
> -                         cur_state ? "on" : "off");
> +                         str_on_off(cur_state));
>
>         *state = cur_state;
>         return 0;
> @@ -240,7 +241,7 @@ static int acpi_power_get_list_state(struct list_head *list, u8 *state)
>                         break;
>         }
>
> -       pr_debug("Power resource list is %s\n", cur_state ? "on" : "off");
> +       pr_debug("Power resource list is %s\n", str_on_off(cur_state));
>
>         *state = cur_state;
>         return 0;
> --

Applied as 6.15 material with edits in the changelog, thanks!