Re: [PATCH v2 2/2] ACPI: bus: Refactor ACPI matching functions for better readability

[Rafael J. Wysocki]

On Fri, Aug 26, 2022 at 7:16 PM Andy Shevchenko
<andriy.shevchenko@xxxxxxxxxxxxxxx> wrote:
>
> With temporary variables for OF and ACPI IDs, it's easier to read
> the code. No functional change intended.
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
> ---
> v2: refactored another function (due to drop the rest of the series)
>  drivers/acpi/bus.c | 20 ++++++++++----------
>  1 file changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
> index f3e868d35144..d466c8195314 100644
> --- a/drivers/acpi/bus.c
> +++ b/drivers/acpi/bus.c
> @@ -925,12 +925,13 @@ static const void *acpi_of_device_get_match_data(const struct device *dev)
>
>  const void *acpi_device_get_match_data(const struct device *dev)
>  {
> +       const struct acpi_device_id *acpi_ids = dev->driver->acpi_match_table;
>         const struct acpi_device_id *match;
>
> -       if (!dev->driver->acpi_match_table)
> +       if (!acpi_ids)
>                 return acpi_of_device_get_match_data(dev);
>
> -       match = acpi_match_device(dev->driver->acpi_match_table, dev);
> +       match = acpi_match_device(acpi_ids, dev);
>         if (!match)
>                 return NULL;
>
> @@ -948,14 +949,13 @@ EXPORT_SYMBOL(acpi_match_device_ids);
>  bool acpi_driver_match_device(struct device *dev,
>                               const struct device_driver *drv)
>  {
> -       if (!drv->acpi_match_table)
> -               return acpi_of_match_device(ACPI_COMPANION(dev),
> -                                           drv->of_match_table,
> -                                           NULL);
> -
> -       return __acpi_match_device(acpi_companion_match(dev),
> -                                  drv->acpi_match_table, drv->of_match_table,
> -                                  NULL, NULL);
> +       const struct acpi_device_id *acpi_ids = drv->acpi_match_table;
> +       const struct of_device_id *of_ids = drv->of_match_table;
> +
> +       if (!acpi_ids)
> +               return acpi_of_match_device(ACPI_COMPANION(dev), of_ids, NULL);
> +
> +       return __acpi_match_device(acpi_companion_match(dev), acpi_ids, of_ids, NULL, NULL);
>  }
>  EXPORT_SYMBOL_GPL(acpi_driver_match_device);
>
> --

Applied along with the [1/2] as 6.1 material, thanks!