On Tue, Aug 09, 2022 at 08:29:35AM +0200, Ahmad Fatoum wrote:
> We will add support for one more mode- prefix in the follow-up commit,
> so rewrite the code to make this addition seamless.
>
> Signed-off-by: Ahmad Fatoum <a.fatoum@xxxxxxxxxxxxxx>
> ---
> drivers/power/reset/reboot-mode.c | 33 +++++++++++++++++++------------
> 1 file changed, 20 insertions(+), 13 deletions(-)
Applied, thanks
Sascha
>
> diff --git a/drivers/power/reset/reboot-mode.c b/drivers/power/reset/reboot-mode.c
> index d9b51dfea677..ab23c32a4370 100644
> --- a/drivers/power/reset/reboot-mode.c
> +++ b/drivers/power/reset/reboot-mode.c
> @@ -12,8 +12,6 @@
> #include <globalvar.h>
> #include <magicvar.h>
>
> -#define PREFIX "mode-"
> -
> static int __priority;
> static struct reboot_mode_driver *__boot_mode;
>
> @@ -111,6 +109,17 @@ static void reboot_mode_print(struct reboot_mode_driver *reboot,
> __pr_printk(7, "\n");
> }
>
> +static const char *get_mode_name(const struct property *prop)
> +{
> + unsigned prefix_len;
> +
> + prefix_len = str_has_prefix(prop->name, "mode-");
> + if (!prefix_len)
> + return NULL;
> +
> + return prop->name + prefix_len;
> +}
> +
> /**
> * reboot_mode_register - register a reboot mode driver
> * @reboot: reboot mode driver
> @@ -123,7 +132,6 @@ int reboot_mode_register(struct reboot_mode_driver *reboot,
> {
> struct property *prop;
> struct device_node *np = reboot->dev->device_node;
> - size_t len = strlen(PREFIX);
> const char *alias;
> size_t nmodes = 0;
> int i = 0;
> @@ -132,7 +140,7 @@ int reboot_mode_register(struct reboot_mode_driver *reboot,
> for_each_property_of_node(np, prop) {
> u32 magic;
>
> - if (strncmp(prop->name, PREFIX, len))
> + if (!get_mode_name(prop))
> continue;
> if (of_property_read_u32(np, prop->name, &magic))
> continue;
> @@ -154,16 +162,9 @@ int reboot_mode_register(struct reboot_mode_driver *reboot,
> magic = &reboot->magics[i * nelems];
> mode = &reboot->modes[i];
>
> - if (strncmp(prop->name, PREFIX, len))
> - continue;
> -
> - if (of_property_read_u32_array(np, prop->name, magic, nelems)) {
> - dev_err(reboot->dev, "reboot mode %s without magic number\n",
> - *mode);
> + *mode = get_mode_name(prop);
> + if (!*mode)
> continue;
> - }
> -
> - *mode = prop->name + len;
> if (*mode[0] == '\0') {
> ret = -EINVAL;
> dev_err(reboot->dev, "invalid mode name(%s): too short!\n",
> @@ -171,6 +172,12 @@ int reboot_mode_register(struct reboot_mode_driver *reboot,
> goto error;
> }
>
> + if (of_property_read_u32_array(np, prop->name, magic, nelems)) {
> + dev_err(reboot->dev, "reboot mode %s without magic number\n",
> + *mode);
> + continue;
> + }
> +
> reboot_mode_print(reboot, *mode, magic);
>
> i++;
> --
> 2.30.2
>
>
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
