[PATCH V2 2/2] ARM: sun9i: smp: fix return code check of of_property_match_string

[Chen-Yu Tsai]

On Fri, Dec 29, 2023 at 3:39 AM Stefan Wahren <wahrenst at gmx.net> wrote:
>
> of_property_match_string returns an int; either an index from 0 or
> greater if successful or negative on failure. Even it's very
> unlikely that the DT CPU node contains multiple enable-methods
> these checks should be fixed.
>
> This patch was inspired by the work of Nick Desaulniers.
>
> Link: https://lore.kernel.org/lkml/20230516-sunxi-v1-1-ac4b9651a8c1@google.com/T/
> Cc: Nick Desaulniers <ndesaulniers at google.com>
> Signed-off-by: Stefan Wahren <wahrenst at gmx.net>

Reviewed-by: Chen-Yu Tsai <wens at csie.org>

Arnd, would it be possible to apply the two fixes directly to the soc tree?

Thanks.

> ---
>  arch/arm/mach-sunxi/mc_smp.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-sunxi/mc_smp.c b/arch/arm/mach-sunxi/mc_smp.c
> index 6ec3445f3c72..277f6aa8e6c2 100644
> --- a/arch/arm/mach-sunxi/mc_smp.c
> +++ b/arch/arm/mach-sunxi/mc_smp.c
> @@ -803,12 +803,12 @@ static int __init sunxi_mc_smp_init(void)
>         for (i = 0; i < ARRAY_SIZE(sunxi_mc_smp_data); i++) {
>                 ret = of_property_match_string(node, "enable-method",
>                                                sunxi_mc_smp_data[i].enable_method);
> -               if (!ret)
> +               if (ret >= 0)
>                         break;
>         }
>
>         of_node_put(node);
> -       if (ret)
> +       if (ret < 0)
>                 return -ENODEV;
>
>         is_a83t = sunxi_mc_smp_data[i].is_a83t;
> --
> 2.34.1
>