public inbox for linux-acpi@vger.kernel.org
 help / color / mirror / Atom feed
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>
Subject: [PATCH v1 7/7] ACPI: watchdog: Replace open coded variant of resource_union()
Date: Thu, 13 Aug 2020 20:57:29 +0300	[thread overview]
Message-ID: <20200813175729.15088-7-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <20200813175729.15088-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>
---
 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


  parent reply	other threads:[~2020-08-13 17:57 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-08-13 17:57 [PATCH v1 1/7] resource: Simplify region_intersects() by reducing conditionals Andy Shevchenko
2020-08-13 17:57 ` [PATCH v1 2/7] resource: Group resource_overlaps() with other inline helpers Andy Shevchenko
2020-08-14 15:18   ` Rafael J. Wysocki
2020-08-14 15:37     ` Andy Shevchenko
2020-08-13 17:57 ` [PATCH v1 3/7] resource: Introduce resource_union() for overlapping resources Andy Shevchenko
2020-08-14 15:23   ` Rafael J. Wysocki
2020-08-14 15:37     ` Andy Shevchenko
2020-08-14 16:09       ` Rafael J. Wysocki
2020-08-14 16:21         ` Andy Shevchenko
2020-08-14 17:17           ` Rafael J. Wysocki
2020-08-14 17:43             ` Andy Shevchenko
2020-08-13 17:57 ` [PATCH v1 4/7] resource: Introduce resource_intersection() " Andy Shevchenko
2020-08-14 15:24   ` Rafael J. Wysocki
2020-08-14 15:38     ` Andy Shevchenko
2020-08-13 17:57 ` [PATCH v1 5/7] PCI/ACPI: Replace open coded variant of resource_union() Andy Shevchenko
2020-08-14 15:26   ` Rafael J. Wysocki
2020-08-13 17:57 ` [PATCH v1 6/7] PCI/ACPI: Fix description of @handle for acpi_is_root_bridge() Andy Shevchenko
2020-08-14 15:11   ` Rafael J. Wysocki
2020-08-14 15:18     ` Andy Shevchenko
2020-08-13 17:57 ` Andy Shevchenko [this message]
2020-08-14 15:27   ` [PATCH v1 7/7] ACPI: watchdog: Replace open coded variant of resource_union() Rafael J. Wysocki
2020-08-14 15:17 ` [PATCH v1 1/7] resource: Simplify region_intersects() by reducing conditionals Rafael J. Wysocki
2020-08-14 15:39   ` 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=20200813175729.15088-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=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