Commit f7499785 authored Nov 03, 2020 by Andy Shevchenko Committed by Rafael J. Wysocki Nov 17, 2020

ACPI: watchdog: Replace open coded variant of resource_union()



Since we have resource_union() helper, let's utilize it here.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Hanjun Guo <guohanjun@huawei.com>
Tested-by: Hanjun Guo <guohanjun@huawei.com>
Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

parent 07aec68e

drivers/acpi/acpi_watchdog.c

+1 −5

Original line number	Diff line number	Diff line
		@@ -151,11 +151,7 @@ void __init acpi_watchdog_init(void)
		found = false;
		resource_list_for_each_entry(rentry, &resource_list) {
		if (rentry->res->flags == res.flags &&
		resource_overlaps(rentry->res, &res)) {
		if (res.start < rentry->res->start)
		rentry->res->start = res.start;
		if (res.end > rentry->res->end)
		rentry->res->end = res.end;
		resource_union(rentry->res, &res, rentry->res)) {
		found = true;
		break;
		}

Admin message