On Thu, Aug 13, 2020 at 7:57 PM Andy Shevchenko
<andriy.shevchenko@xxxxxxxxxxxxxxx> wrote:
>
> Since we have resource_union() helper, let's utilize it here.
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
> Cc: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@xxxxxxxxxxxxxxx>
> Cc: Bjorn Helgaas <bhelgaas@xxxxxxxxxx>
> Cc: linux-pci@xxxxxxxxxxxxxxx
Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>
> ---
> drivers/acpi/pci_root.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
> index f90e841c59f5..2a6a741896de 100644
> --- a/drivers/acpi/pci_root.c
> +++ b/drivers/acpi/pci_root.c
> @@ -724,9 +724,7 @@ static void acpi_pci_root_validate_resources(struct device *dev,
> * our resources no longer match the ACPI _CRS, but
> * the kernel resource tree doesn't allow overlaps.
> */
> - if (resource_overlaps(res1, res2)) {
> - res2->start = min(res1->start, res2->start);
> - res2->end = max(res1->end, res2->end);
> + if (resource_union(res1, res2, res2)) {
> dev_info(dev, "host bridge window expanded to %pR; %pR ignored\n",
> res2, res1);
> free = true;
> --
> 2.28.0
>
