From patchwork Fri Mar 28 11:41:26 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 27264 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f197.google.com (mail-ie0-f197.google.com [209.85.223.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id D452620062 for ; Fri, 28 Mar 2014 11:43:12 +0000 (UTC) Received: by mail-ie0-f197.google.com with SMTP id rd18sf17277646iec.0 for ; Fri, 28 Mar 2014 04:43:12 -0700 (PDT) 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:in-reply-to:references :sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=ZKsxaavVwwz6eSW4QtQp236Sxb4q9/CbWMmgaOnnatk=; b=mL/6kppcC7+H7KoPzP3BfDhndr4HjC1QwXuq6OoDZKwoR/O8DuMTOxvVRaVKP9+NSu H7yQnCzco6m+8DBqMn6u1qtHgITNPKZEg9Uo+aRMrsOdQqdgrUiInI92oBQWKeALCO7I dxTgG1nGK4nhwc3N0mPkim7NTFlkuZt2B2BDqk2O/iN5t5O5kYp+DvX5lUG8VgcVANBY twa1nbOoeKCf9IXO3ChJNw1ouX1zDxqyzVjXewAHPsNVOKA2LFg6ccqhW4nrN/D+RWet zqE/RsGpwkXpvPDKTA3m9YEcxEmKbhRnmMUAbjhbyzCJvazCMBjE3qeLTuX4YAwCuTXd 45sA== X-Gm-Message-State: ALoCoQkHH5JTwpreQNGCaDvdcVf/bspUmxefrAWubdnr4d1Hgx+9+OSZJtLgvyi3Kjfi6IqCsEwF X-Received: by 10.183.1.7 with SMTP id bc7mr516413obd.47.1396006992280; Fri, 28 Mar 2014 04:43:12 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.48.202 with SMTP id o68ls1465495qga.53.gmail; Fri, 28 Mar 2014 04:43:12 -0700 (PDT) X-Received: by 10.221.26.10 with SMTP id rk10mr6811665vcb.0.1396006992178; Fri, 28 Mar 2014 04:43:12 -0700 (PDT) Received: from mail-ve0-f175.google.com (mail-ve0-f175.google.com [209.85.128.175]) by mx.google.com with ESMTPS id 2si1094810vcd.95.2014.03.28.04.43.12 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 28 Mar 2014 04:43:12 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.175 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.175; Received: by mail-ve0-f175.google.com with SMTP id oz11so5529992veb.6 for ; Fri, 28 Mar 2014 04:43:12 -0700 (PDT) X-Received: by 10.58.207.74 with SMTP id lu10mr6707771vec.15.1396006992101; Fri, 28 Mar 2014 04:43:12 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.12.8 with SMTP id v8csp1577vcv; Fri, 28 Mar 2014 04:43:11 -0700 (PDT) X-Received: by 10.68.191.200 with SMTP id ha8mr8154852pbc.66.1396006991221; Fri, 28 Mar 2014 04:43:11 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id tk9si3522806pac.170.2014.03.28.04.43.10; Fri, 28 Mar 2014 04:43:10 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752163AbaC1Lmp (ORCPT + 27 others); Fri, 28 Mar 2014 07:42:45 -0400 Received: from mail-wg0-f50.google.com ([74.125.82.50]:53262 "EHLO mail-wg0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751049AbaC1Lmj (ORCPT ); Fri, 28 Mar 2014 07:42:39 -0400 Received: by mail-wg0-f50.google.com with SMTP id x13so3394520wgg.33 for ; Fri, 28 Mar 2014 04:42:37 -0700 (PDT) X-Received: by 10.180.72.239 with SMTP id g15mr47194036wiv.45.1396006957776; Fri, 28 Mar 2014 04:42:37 -0700 (PDT) Received: from localhost ([213.122.173.131]) by mx.google.com with ESMTPSA id t1sm2225642wia.1.2014.03.28.04.42.34 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 28 Mar 2014 04:42:36 -0700 (PDT) From: Viresh Kumar To: tglx@linutronix.de Cc: linaro-kernel@lists.linaro.org, linux-kernel@vger.kernel.org, fweisbec@gmail.com, linaro-networking@linaro.org, Arvind.Chauhan@arm.com, Viresh Kumar Subject: [PATCH 07/16] hrtimer: remove 'base' parameter from hrtimer_{enqueue_}reprogram() Date: Fri, 28 Mar 2014 17:11:26 +0530 Message-Id: X-Mailer: git-send-email 1.7.12.rc2.18.g61b472e In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: viresh.kumar@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.175 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , clock 'base' can be obtained easily by doing timer->base and hrtimer_reprogram() & hrtimer_enqueue_reprogram() never gets anything else than timer->base as its parameter. And so these routines doesn't require this parameter. Remove it. Signed-off-by: Viresh Kumar --- kernel/hrtimer.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c index d6724b5..98a73d9 100644 --- a/kernel/hrtimer.c +++ b/kernel/hrtimer.c @@ -584,11 +584,10 @@ hrtimer_force_reprogram(struct hrtimer_cpu_base *cpu_base, int skip_equal) * * Called with interrupts disabled and base->cpu_base.lock held */ -static int hrtimer_reprogram(struct hrtimer *timer, - struct hrtimer_clock_base *base) +static int hrtimer_reprogram(struct hrtimer *timer) { struct hrtimer_cpu_base *cpu_base = &__get_cpu_var(hrtimer_bases); - ktime_t expires = hrtimer_get_monoexpires(timer, base); + ktime_t expires = hrtimer_get_monoexpires(timer, timer->base); int res; WARN_ON_ONCE(hrtimer_get_expires_tv64(timer) < 0); @@ -648,10 +647,9 @@ static inline void hrtimer_init_hres(struct hrtimer_cpu_base *base) * check happens. The timer gets enqueued into the rbtree. The reprogramming * and expiry check is done in the hrtimer_interrupt or in the softirq. */ -static inline int hrtimer_enqueue_reprogram(struct hrtimer *timer, - struct hrtimer_clock_base *base) +static inline int hrtimer_enqueue_reprogram(struct hrtimer *timer) { - return base->cpu_base->hres_active && hrtimer_reprogram(timer, base); + return timer->base->cpu_base->hres_active && hrtimer_reprogram(timer); } static inline ktime_t hrtimer_update_base(struct hrtimer_cpu_base *base) @@ -730,8 +728,7 @@ static void clock_was_set_delayed(void) static inline int hrtimer_hres_active(void) { return 0; } static inline int hrtimer_is_hres_enabled(void) { return 0; } static inline int hrtimer_switch_to_hres(void) { return 0; } -static inline int hrtimer_enqueue_reprogram(struct hrtimer *timer, - struct hrtimer_clock_base *base) +static inline int hrtimer_enqueue_reprogram(struct hrtimer *timer) { return 0; } @@ -984,7 +981,7 @@ int __hrtimer_start_range_ns(struct hrtimer *timer, ktime_t tim, * XXX send_remote_softirq() ? */ if (leftmost && new_base->cpu_base == &__get_cpu_var(hrtimer_bases) - && hrtimer_enqueue_reprogram(timer, new_base)) { + && hrtimer_enqueue_reprogram(timer)) { if (wakeup) { /* * We need to drop cpu_base->lock to avoid a