From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: linux-acpi@vger.kernel.org,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-kernel@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 v4 6/6] ACPI: watchdog: Replace open coded variant of resource_union()
Date: Mon, 2 Nov 2020 23:00:25 +0200 [thread overview]
Message-ID: <20201102210025.53520-7-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <20201102210025.53520-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>
Reviewed-by: 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-11-02 21:00 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-02 21:00 [PATCH v4 0/6] resource: introduce union(), intersection() API Andy Shevchenko
2020-11-02 21:00 ` [PATCH v4 1/6] resource: Simplify region_intersects() by reducing conditionals Andy Shevchenko
2020-11-02 21:00 ` [PATCH v4 2/6] resource: Group resource_overlaps() with other inline helpers Andy Shevchenko
2020-11-02 21:00 ` [PATCH v4 3/6] resource: Introduce resource_union() for overlapping resources Andy Shevchenko
2020-11-02 21:00 ` [PATCH v4 4/6] resource: Introduce resource_intersection() " Andy Shevchenko
2020-11-02 21:00 ` [PATCH v4 5/6] PCI/ACPI: Replace open coded variant of resource_union() Andy Shevchenko
2020-11-02 21:03 ` Kuppuswamy, Sathyanarayanan
2020-11-02 21:00 ` Andy Shevchenko [this message]
2020-11-03 0:43 ` [PATCH v4 0/6] resource: introduce union(), intersection() API Hanjun Guo
2020-11-03 8:31 ` Andy Shevchenko
2020-11-03 9:44 ` Hanjun Guo
2020-11-03 6:48 ` Greg Kroah-Hartman
2020-11-03 8:32 ` Andy Shevchenko
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=20201102210025.53520-7-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mika.westerberg@linux.intel.com \
--cc=rafael.j.wysocki@intel.com \
/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;
as well as URLs for NNTP newsgroup(s).