On 11/2/20 1:00 PM, Andy Shevchenko wrote:
Since we have resource_union() helper, let's utilize it here.
Signed-off-by: Andy Shevchenko <[email protected]>
Cc: Kuppuswamy Sathyanarayanan <[email protected]>
Cc: Bjorn Helgaas <[email protected]>
Cc: [email protected]
Reviewed-by: Rafael J. Wysocki <[email protected]>
Reviewed-by: Kuppuswamy Sathyanarayanan
<[email protected]>
---
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 c12b5fb3e8fb..0bf072cef6cf 100644
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
@@ -722,9 +722,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;
--
Sathyanarayanan Kuppuswamy
Linux Kernel Developer
