From patchwork Fri Jan 23 00:09:18 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 43546 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-we0-f198.google.com (mail-we0-f198.google.com [74.125.82.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id EFF0F218DB for ; Fri, 23 Jan 2015 00:09:43 +0000 (UTC) Received: by mail-we0-f198.google.com with SMTP id q59sf2587000wes.1 for ; Thu, 22 Jan 2015 16:09:43 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=Jeb5wUzo3y7Kf0bVhmyh15LLrXri+g0SZMkpyrf+5tk=; b=TCVau9mRSTIcLtQ2A531YbfKSLi3UMeA3DBM7zjhuZTp6xmBKH5z3GMW+i+5Hdwcc0 dmGc3O/n32Nor35rvg4R9COmLzQVe+fmfaSj4HuZ3PphMD9csys61RpVGRDB8Qn4cjTP QpJFEBO7ky/SuTQOhrtXYpRv9BhW6w4a3+gw572AaQiDEtJi30ev9kHqwZkpsUI39ius Iv5VIy1F439vnnhhcDcOfxqCplesC9GlOW4mQ4kvW3rFn+5cS/3WFPfauaj4STYhWVQt BnXOYw0KK0MebztZ59h9CTg4cX6grF8BID4ndwT4lR0J8QJ5vM7dKXQ9go4VPFBnlLGT 0ySg== X-Gm-Message-State: ALoCoQl9ujpgVdFZw95hzAV8GlN4trvZwgfBIW+96SiFD55/FcXSRY0EiVt2G/A45BTQdWFnAA8G X-Received: by 10.152.3.234 with SMTP id f10mr582026laf.1.1421971783241; Thu, 22 Jan 2015 16:09:43 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.242.129 with SMTP id wq1ls200214lac.56.gmail; Thu, 22 Jan 2015 16:09:43 -0800 (PST) X-Received: by 10.152.4.200 with SMTP id m8mr4430295lam.17.1421971783099; Thu, 22 Jan 2015 16:09:43 -0800 (PST) Received: from mail-la0-f51.google.com (mail-la0-f51.google.com. [209.85.215.51]) by mx.google.com with ESMTPS id tz3si22035666lbb.66.2015.01.22.16.09.43 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 22 Jan 2015 16:09:43 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.51 as permitted sender) client-ip=209.85.215.51; Received: by mail-la0-f51.google.com with SMTP id ge10so4625030lab.10 for ; Thu, 22 Jan 2015 16:09:43 -0800 (PST) X-Received: by 10.152.234.35 with SMTP id ub3mr4569932lac.70.1421971783016; Thu, 22 Jan 2015 16:09:43 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.112.9.200 with SMTP id c8csp63875lbb; Thu, 22 Jan 2015 16:09:41 -0800 (PST) X-Received: by 10.70.52.161 with SMTP id u1mr6749841pdo.44.1421971777424; Thu, 22 Jan 2015 16:09:37 -0800 (PST) Received: from mail-pd0-f176.google.com (mail-pd0-f176.google.com. [209.85.192.176]) by mx.google.com with ESMTPS id fc3si14550627pad.15.2015.01.22.16.09.36 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 22 Jan 2015 16:09:37 -0800 (PST) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 209.85.192.176 as permitted sender) client-ip=209.85.192.176; Received: by mail-pd0-f176.google.com with SMTP id y10so4787952pdj.7 for ; Thu, 22 Jan 2015 16:09:36 -0800 (PST) X-Received: by 10.68.135.197 with SMTP id pu5mr6384338pbb.105.1421971776460; Thu, 22 Jan 2015 16:09:36 -0800 (PST) Received: from localhost.localdomain (c-67-170-153-23.hsd1.or.comcast.net. [67.170.153.23]) by mx.google.com with ESMTPSA id am14sm10405657pac.35.2015.01.22.16.09.35 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 22 Jan 2015 16:09:35 -0800 (PST) From: John Stultz To: Linux Kernel Mailing List Cc: John Stultz , Dave Jones , Linus Torvalds , Thomas Gleixner , Richard Cochran , Prarit Bhargava , Stephen Boyd , Ingo Molnar , Peter Zijlstra Subject: [PATCH 03/12] clocksource: Remove clocksource_max_deferment() Date: Thu, 22 Jan 2015 16:09:18 -0800 Message-Id: <1421971767-17707-4-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1421971767-17707-1-git-send-email-john.stultz@linaro.org> References: <1421971767-17707-1-git-send-email-john.stultz@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: john.stultz@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.51 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , clocksource_max_deferment() doesn't do anything useful anymore, so zap it. Cc: Dave Jones Cc: Linus Torvalds Cc: Thomas Gleixner Cc: Richard Cochran Cc: Prarit Bhargava Cc: Stephen Boyd Cc: Ingo Molnar Cc: Peter Zijlstra Signed-off-by: John Stultz --- kernel/time/clocksource.c | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c index e837ffd1..0696559 100644 --- a/kernel/time/clocksource.c +++ b/kernel/time/clocksource.c @@ -575,20 +575,6 @@ u64 clocks_calc_max_nsecs(u32 mult, u32 shift, u32 maxadj, u64 mask) return max_nsecs; } -/** - * clocksource_max_deferment - Returns max time the clocksource should be deferred - * @cs: Pointer to clocksource - * - */ -static u64 clocksource_max_deferment(struct clocksource *cs) -{ - u64 max_nsecs; - - max_nsecs = clocks_calc_max_nsecs(cs->mult, cs->shift, cs->maxadj, - cs->mask); - return max_nsecs; -} - #ifndef CONFIG_ARCH_USES_GETTIMEOFFSET static struct clocksource *clocksource_find_best(bool oneshot, bool skipcur) @@ -760,7 +746,8 @@ void __clocksource_updatefreq_scale(struct clocksource *cs, u32 scale, u32 freq) cs->maxadj = clocksource_max_adjustment(cs); } - cs->max_idle_ns = clocksource_max_deferment(cs); + cs->max_idle_ns = clocks_calc_max_nsecs(cs->mult, cs->shift, + cs->maxadj, cs->mask); } EXPORT_SYMBOL_GPL(__clocksource_updatefreq_scale); @@ -807,7 +794,8 @@ int clocksource_register(struct clocksource *cs) cs->name); /* calculate max idle time permitted for this clocksource */ - cs->max_idle_ns = clocksource_max_deferment(cs); + cs->max_idle_ns = clocks_calc_max_nsecs(cs->mult, cs->shift, + cs->maxadj, cs->mask); mutex_lock(&clocksource_mutex); clocksource_enqueue(cs);