From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: "Rafael J. Wysocki" <rjw@rjwysocki.net>,
Len Brown <lenb@kernel.org>,
linux-acpi@vger.kernel.org
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Mika Westerberg <mika.westerberg@linux.intel.com>,
"Rafael J . Wysocki" <rafael.j.wysocki@intel.com>
Subject: [PATCH v3 6/6] ACPI: watchdog: Replace open coded variant of resource_union()
Date: Fri, 30 Oct 2020 19:25:56 +0200 [thread overview]
Message-ID: <20201030172556.21686-7-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <20201030172556.21686-1-andriy.shevchenko@linux.intel.com>
Since we have resource_union() helper, let's utilize it here.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Mika Westerberg <mika.westerberg@linux.intel.com>
Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---
drivers/acpi/acpi_watchdog.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/drivers/acpi/acpi_watchdog.c b/drivers/acpi/acpi_watchdog.c
index 5c1e9ea43123..ca28183f4d13 100644
--- a/drivers/acpi/acpi_watchdog.c
+++ b/drivers/acpi/acpi_watchdog.c
@@ -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;
}
--
2.28.0
next prev parent reply other threads:[~2020-10-30 17:26 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-30 17:25 [PATCH v3 0/6] resource: introduce union(), intersection() API Andy Shevchenko
2020-10-30 17:25 ` [PATCH v3 1/6] resource: Simplify region_intersects() by reducing conditionals Andy Shevchenko
2020-10-30 17:25 ` [PATCH v3 2/6] resource: Group resource_overlaps() with other inline helpers Andy Shevchenko
2020-10-30 17:25 ` [PATCH v3 3/6] resource: Introduce resource_union() for overlapping resources Andy Shevchenko
2020-10-30 17:25 ` [PATCH v3 4/6] resource: Introduce resource_intersection() " Andy Shevchenko
2020-10-30 17:25 ` [PATCH v3 5/6] PCI/ACPI: Replace open coded variant of resource_union() Andy Shevchenko
2020-10-30 17:25 ` Andy Shevchenko [this message]
2020-11-02 19:29 ` [PATCH v3 0/6] resource: introduce union(), intersection() API Rafael J. Wysocki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201030172556.21686-7-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=mika.westerberg@linux.intel.com \
--cc=rafael.j.wysocki@intel.com \
--cc=rjw@rjwysocki.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox