Re: [PATCH v1 8/8] efi/dev-path-parser: Refactor _UID handling to use acpi_dev_uid_to_integer()

[Ard Biesheuvel]

On Wed, 7 Sept 2022 at 18:57, Andy Shevchenko
<andriy.shevchenko@xxxxxxxxxxxxxxx> wrote:
>
> ACPI utils provide acpi_dev_uid_to_integer() helper to extract _UID as
> an integer. Use it instead of custom approach.
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
> ---
>  drivers/firmware/efi/dev-path-parser.c | 10 ++++++----
>  1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/firmware/efi/dev-path-parser.c b/drivers/firmware/efi/dev-path-parser.c
> index eb9c65f97841..113b3ca1bd76 100644
> --- a/drivers/firmware/efi/dev-path-parser.c
> +++ b/drivers/firmware/efi/dev-path-parser.c
> @@ -15,9 +15,11 @@
>  static long __init parse_acpi_path(const struct efi_dev_path *node,
>                                    struct device *parent, struct device **child)
>  {
> -       char hid[ACPI_ID_LEN], uid[11]; /* UINT_MAX + null byte */
>         struct acpi_device *adev;
>         struct device *phys_dev;
> +       char hid[ACPI_ID_LEN];
> +       long ret;
> +       u64 uid;
>
>         if (node->header.length != 12)
>                 return -EINVAL;
> @@ -27,12 +29,12 @@ static long __init parse_acpi_path(const struct efi_dev_path *node,
>                 'A' + ((node->acpi.hid >>  5) & 0x1f) - 1,
>                 'A' + ((node->acpi.hid >>  0) & 0x1f) - 1,
>                         node->acpi.hid >> 16);
> -       sprintf(uid, "%u", node->acpi.uid);
>
>         for_each_acpi_dev_match(adev, hid, NULL, -1) {
> -               if (adev->pnp.unique_id && !strcmp(adev->pnp.unique_id, uid))
> +               ret = acpi_dev_uid_to_integer(adev, &uid);
> +               if (ret == -ENODATA && node->acpi.uid == 0)
>                         break;
> -               if (!adev->pnp.unique_id && node->acpi.uid == 0)
> +               if (ret == 0 && node->acpi.uid == uid)

Is it necessary to reorder the conditions here? I.e., why not

> +               ret = acpi_dev_uid_to_integer(adev, &uid);
> +               if (ret == 0 && node->acpi.uid == uid)
>                         break;
> +               if (ret == -ENODATA && node->acpi.uid == 0)
>                         break;

?

With that fixed,

Reviewed-by: Ard Biesheuvel <ardb@xxxxxxxxxx>