From patchwork Fri Apr 4 06:36:14 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 27756 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pb0-f71.google.com (mail-pb0-f71.google.com [209.85.160.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id A71592036E for ; Fri, 4 Apr 2014 06:44:00 +0000 (UTC) Received: by mail-pb0-f71.google.com with SMTP id up15sf10848198pbc.2 for ; Thu, 03 Apr 2014 23:43:59 -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=O5vKaap6vFuY0DrAz00dhxseecSsV8m7tPExa25iUjc=; b=cWxZOMKTkkPHMNMhbXXQ6+q2R5hzEtER8+8EJ6FhSDsA6VniLL4QSQw0EAGHoZE+xv yjhhSyHTpwQAOrjdHQqi8R/JM8FmEvgJSlOXnyVugGhhmpNVTn9tNbj8bO4Cvy8PAQL9 mP1L91aECzhFaXvFYrIlhmJvp9qYDEE73Tp3UsG+8+Gy6wFCK6uCBZlP470lerYvOT/P 8LdPirLTfjyCBoJDJ6p6PIKMiym7dCEANzTo7fdjkRylIFOkDLlqqre2lT0A+qI2QwRw 7ODvR0iNODzjNjO+O4QF5XaKlLiNIcCl6L6mLVWb+9YHbdd2bjDwTlMnGwJ5cOBhmD0G dy+w== X-Gm-Message-State: ALoCoQnMd/mCs5idZNuW15rkCAbxxXdrMBELehJFSxz/y7YPcp8aMQF8ifJIqbq1V1zmOGXrpcOM X-Received: by 10.66.66.196 with SMTP id h4mr6572562pat.22.1396593839927; Thu, 03 Apr 2014 23:43:59 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.48.202 with SMTP id o68ls941430qga.53.gmail; Thu, 03 Apr 2014 23:43:59 -0700 (PDT) X-Received: by 10.58.126.4 with SMTP id mu4mr3685907veb.0.1396593839839; Thu, 03 Apr 2014 23:43:59 -0700 (PDT) Received: from mail-vc0-f177.google.com (mail-vc0-f177.google.com [209.85.220.177]) by mx.google.com with ESMTPS id ie18si629168vec.121.2014.04.03.23.43.59 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 03 Apr 2014 23:43:59 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.177 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.177; Received: by mail-vc0-f177.google.com with SMTP id if17so2803700vcb.36 for ; Thu, 03 Apr 2014 23:43:59 -0700 (PDT) X-Received: by 10.52.240.207 with SMTP id wc15mr9946508vdc.14.1396593839546; Thu, 03 Apr 2014 23:43:59 -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 v8csp89369vcv; Thu, 3 Apr 2014 23:43:58 -0700 (PDT) X-Received: by 10.68.254.103 with SMTP id ah7mr12633571pbd.159.1396593835983; Thu, 03 Apr 2014 23:43:55 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id xs1si4206350pab.32.2014.04.03.23.43.54; Thu, 03 Apr 2014 23:43:54 -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 S1752960AbaDDGm5 (ORCPT + 27 others); Fri, 4 Apr 2014 02:42:57 -0400 Received: from mail-wg0-f43.google.com ([74.125.82.43]:64984 "EHLO mail-wg0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752914AbaDDGmt (ORCPT ); Fri, 4 Apr 2014 02:42:49 -0400 Received: by mail-wg0-f43.google.com with SMTP id x13so2889792wgg.26 for ; Thu, 03 Apr 2014 23:42:48 -0700 (PDT) X-Received: by 10.194.6.106 with SMTP id z10mr16810443wjz.1.1396593768571; Thu, 03 Apr 2014 23:42:48 -0700 (PDT) Received: from localhost ([213.122.173.131]) by mx.google.com with ESMTPSA id pm5sm11025825wjc.11.2014.04.03.23.42.45 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 03 Apr 2014 23:42:47 -0700 (PDT) From: Viresh Kumar To: tglx@linutronix.de Cc: linaro-kernel@lists.linaro.org, fweisbec@gmail.com, linaro-networking@linaro.org, Arvind.Chauhan@arm.com, linux-kernel@vger.kernel.org, Viresh Kumar Subject: [PATCH V2 31/36] hrtimer: remove 'base' parameter from hrtimer_{enqueue_}reprogram() Date: Fri, 4 Apr 2014 12:06:14 +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.220.177 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 abbf155..fcbabcf 100644 --- a/kernel/hrtimer.c +++ b/kernel/hrtimer.c @@ -597,11 +597,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); @@ -661,10 +660,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) @@ -743,8 +741,7 @@ 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; } @@ -991,7 +988,7 @@ int __hrtimer_start_range_ns(struct hrtimer *timer, ktime_t tim, * XXX send_remote_softirq() ? */ if (leftmost && base_on_this_cpu(new_base) - && hrtimer_enqueue_reprogram(timer, new_base)) { + && hrtimer_enqueue_reprogram(timer)) { if (wakeup) { /* * We need to drop cpu_base->lock to avoid a