Received: by 2002:a05:6a10:17d3:0:0:0:0 with SMTP id hz19csp650898pxb; Fri, 16 Apr 2021 14:51:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyG/pX7laMRq7R67LNExMJdJUCdXVrfr37Mik7x5ZSPP2+Lu1DKqLmqKisX1htVQNLQ+AtL X-Received: by 2002:a05:6402:17c6:: with SMTP id s6mr12468696edy.319.1618609894514; Fri, 16 Apr 2021 14:51:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618609894; cv=none; d=google.com; s=arc-20160816; b=NEQ0tWDwkevsc2i1JpJmUyNVsYXf3rRE9ADYSeEeKM+/ItQcXbX9KCc8aqtgvdPUBV 0E+4BeRcrMBZsnbALky5bnzauR8IlYBsFiv+cWaiRDADxKwaOt0YzlzHQq9bxBpr5Cuw 2NeKD3chvXuIofZ5tGpxrO5/rHRp4SilhTJmwzbexxRZMQW5h8BNScQQL3zqQ9icPbv5 eojrALdWeL64LPcHMnNdIXiQS0FCsFZQ0baJCS422gXxm/jUbjHTXjXji2cfz3BA+EqT PCzsdjIG40HGDwNsLGmhnnZSllsEIDInm+4Va4CuwcrGsK7EyfdB1drSGYUgn0fe8SH+ AvZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=Rs7H9++iukDUMdDgPrGBCMc4aazWQuUJdeFDnMN55Fw=; b=rHstzILmNf/tJ9693c6pA2goAU5GZ1Zqi2gjXOsa3UC1Ck1ZpY7No3DGaEUI9LubSj zdVIDz4kYh7sKEy/PWp6t+UDIBt9Fi01QpT7VUmb85rQmFz8f8Iv3cKpqVgulCUcSReo B3Y6iOXBxJc1dPLf5nOqcma83rZn/j8TAGFzh2k4kbvt8pMs5SsE/0gM4Ml22BnvcU+9 uihp9Zd6CHf1z26h6wcxPOc0n0i5c2NTYrTh+hlj8O7JZFd8GfVS8Nl8kuOqhTpByKgs 2M2/sjN4nd85SXhzXwjvW1JDAtl+O9qb1Z5VjECBjHuva0C4hyVX4sANQXZN6R9Xn94X poqg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=SoAxEH1t; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id i14si6225321eje.519.2021.04.16.14.51.11; Fri, 16 Apr 2021 14:51:34 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=SoAxEH1t; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241790AbhDPTIa (ORCPT + 99 others); Fri, 16 Apr 2021 15:08:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49632 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241292AbhDPTIZ (ORCPT ); Fri, 16 Apr 2021 15:08:25 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9FBFEC061574; Fri, 16 Apr 2021 12:08:00 -0700 (PDT) Date: Fri, 16 Apr 2021 19:07:56 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1618600078; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Rs7H9++iukDUMdDgPrGBCMc4aazWQuUJdeFDnMN55Fw=; b=SoAxEH1tYb/dmHBoopiTFS8NKUG2P1PNkuIalYBAWeSO4eqfgOclwDOwKzQ2UWvjLiDls9 2VjHd7XSSo1oLLk9Sjs3ZR8Lv0+j+RTsIf9T/7GuFEfQKO6bOGqTqblj+OrPL4JdD0h8uy kEHKim8+wVkkbYejurZGeG/UfRIq+N9EDhwAnb14+38rgOMnsBON4ZV3c7HodlJ1SgJe0C GpXE1UN2Ml1d3a5SFBgS9Es9R+Rx4t1LhZWkyRKXHf4eQ0k5tqWYov0cqEvltimFoK/xXk BMYvpI59MuEaUWlT6NB828mo50uz1Yp/LrGPkctVvVopwMYFFjuKLyVuA980HQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1618600078; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Rs7H9++iukDUMdDgPrGBCMc4aazWQuUJdeFDnMN55Fw=; b=kPyR+mfIuCSqxYMuxzQKSi9cM1nHCw7x1ELZiA0hBG/sfoywgjfagAfoglHcJ/QIjsjbcU MSCuSGbpSEoHc+DQ== From: "tip-bot2 for Wang Wensheng" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: timers/core] tick: Use tick_check_replacement() instead of open coding it Cc: Wang Wensheng , Thomas Gleixner , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20210326022328.3266-1-wangwensheng4@huawei.com> References: <20210326022328.3266-1-wangwensheng4@huawei.com> MIME-Version: 1.0 Message-ID: <161860007631.29796.743363594563784489.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the timers/core branch of tip: Commit-ID: d7840aaadd6e84915866a8f0dab586f6107dadf1 Gitweb: https://git.kernel.org/tip/d7840aaadd6e84915866a8f0dab586f6107dadf1 Author: Wang Wensheng AuthorDate: Fri, 26 Mar 2021 02:23:28 Committer: Thomas Gleixner CommitterDate: Fri, 16 Apr 2021 21:03:50 +02:00 tick: Use tick_check_replacement() instead of open coding it The function tick_check_replacement() is the combination of tick_check_percpu() and tick_check_preferred(), but tick_check_new_device() has the same logic open coded. Use the helper to simplify the code. [ tglx: Massage changelog ] Signed-off-by: Wang Wensheng Signed-off-by: Thomas Gleixner Link: https://lore.kernel.org/r/20210326022328.3266-1-wangwensheng4@huawei.com --- kernel/time/tick-common.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/kernel/time/tick-common.c b/kernel/time/tick-common.c index 9d3a225..e15bc0e 100644 --- a/kernel/time/tick-common.c +++ b/kernel/time/tick-common.c @@ -348,12 +348,7 @@ void tick_check_new_device(struct clock_event_device *newdev) td = &per_cpu(tick_cpu_device, cpu); curdev = td->evtdev; - /* cpu local device ? */ - if (!tick_check_percpu(curdev, newdev, cpu)) - goto out_bc; - - /* Preference decision */ - if (!tick_check_preferred(curdev, newdev)) + if (!tick_check_replacement(curdev, newdev)) goto out_bc; if (!try_module_get(newdev->owner))