From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F28C2C433EB for ; Mon, 17 Aug 2020 16:47:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D1E7420674 for ; Mon, 17 Aug 2020 16:47:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387831AbgHQQr2 (ORCPT ); Mon, 17 Aug 2020 12:47:28 -0400 Received: from mga06.intel.com ([134.134.136.31]:23599 "EHLO mga06.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387578AbgHQQhy (ORCPT ); Mon, 17 Aug 2020 12:37:54 -0400 IronPort-SDR: TSTaWgNNzjVjCbAx8RsB+VT3baOlNvr6FVaPOfvteo3D0IvN0E6/FgWOUQNK+sw5jr6ztvC5W4 HxuxbTt3x1+A== X-IronPort-AV: E=McAfee;i="6000,8403,9716"; a="216269424" X-IronPort-AV: E=Sophos;i="5.76,324,1592895600"; d="scan'208";a="216269424" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Aug 2020 09:36:52 -0700 IronPort-SDR: jdE0bG+pSW6xLQQvICjklQJiEH9wHHr8evgnSKpVphavdaWgiKzCyKxkYnkHv1l6ZuW1nTEbYf g6muUiuwVvrg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,324,1592895600"; d="scan'208";a="328677919" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga002.fm.intel.com with ESMTP; 17 Aug 2020 09:36:50 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 0AD0546E; Mon, 17 Aug 2020 19:36:48 +0300 (EEST) From: Andy Shevchenko To: "Rafael J. Wysocki" , Len Brown , linux-acpi@vger.kernel.org Cc: Andy Shevchenko , Mika Westerberg , "Rafael J . Wysocki" Subject: [PATCH v2 8/8] ACPI: watchdog: Replace open coded variant of resource_union() Date: Mon, 17 Aug 2020 19:36:47 +0300 Message-Id: <20200817163647.48982-8-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200817163647.48982-1-andriy.shevchenko@linux.intel.com> References: <20200817163647.48982-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org Since we have resource_union() helper, let's utilize it here. Signed-off-by: Andy Shevchenko Cc: Mika Westerberg Reviewed-by: Rafael J. Wysocki --- v2: added Rb tag (Rafael) 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