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.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 197BCC388F9 for ; Mon, 2 Nov 2020 21:00:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B136320715 for ; Mon, 2 Nov 2020 21:00:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726859AbgKBVAc (ORCPT ); Mon, 2 Nov 2020 16:00:32 -0500 Received: from mga11.intel.com ([192.55.52.93]:8786 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726820AbgKBVAa (ORCPT ); Mon, 2 Nov 2020 16:00:30 -0500 IronPort-SDR: 251VbEkLNiBlxhFs/qKfhxxlzpTZAz4xjcMUB7C2v+9wgGQm3PMi55nrxLPR0O6Vq3AIYCY3K/ s+E+Xsl1hpEw== X-IronPort-AV: E=McAfee;i="6000,8403,9793"; a="165447788" X-IronPort-AV: E=Sophos;i="5.77,445,1596524400"; d="scan'208";a="165447788" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Nov 2020 13:00:30 -0800 IronPort-SDR: 8X6tn+qfasHVtIMsdwGayNv7Xn2KaWkOty6XMIvu9zawmIeBcTIk5aSJzOF7ryFjBPAJH782Si bGuKL5j1/eTg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,445,1596524400"; d="scan'208";a="528149418" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga005.fm.intel.com with ESMTP; 02 Nov 2020 13:00:28 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id F012435B; Mon, 2 Nov 2020 23:00:25 +0200 (EET) From: Andy Shevchenko To: linux-acpi@vger.kernel.org, Greg Kroah-Hartman , linux-kernel@vger.kernel.org Cc: Andy Shevchenko , Mika Westerberg , "Rafael J . Wysocki" Subject: [PATCH v4 6/6] ACPI: watchdog: Replace open coded variant of resource_union() Date: Mon, 2 Nov 2020 23:00:25 +0200 Message-Id: <20201102210025.53520-7-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201102210025.53520-1-andriy.shevchenko@linux.intel.com> References: <20201102210025.53520-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Mika Westerberg Reviewed-by: Rafael J. Wysocki --- 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