From patchwork Fri Apr 4 06:36:12 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 27754 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yk0-f198.google.com (mail-yk0-f198.google.com [209.85.160.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 68D552036E for ; Fri, 4 Apr 2014 06:43:56 +0000 (UTC) Received: by mail-yk0-f198.google.com with SMTP id 9sf5341977ykp.1 for ; Thu, 03 Apr 2014 23:43:56 -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=5gXUCj3XvXS7WWYxPMo2ecdLx7r7j7oOySEFyJp2NW0=; b=fqQdQRmTn4F41OBiPJjfkffModry8WxVMSN06zrdI9tD4AA/cvbs9bODYF/sB3TxFT cwl0bc6uqFR+lOQyq2uaKexno+NmoF9FGgB4YrL2wZM+jIC8/JY5hHIHXlhUZqc9oRAY ZUdlbYDYBXgWDYove17PrQmtK06X5B1eUTSZd5cZ3qkO68Yee5k8yPgBcIWfA7srpYAx XSqn6lSOAu8LJ0oXpRIQ0QY6o+bTASONYwmJ3dU2lxGDu+Y47zDT+kOcWrJNT4R9XUuz DNaiG4qCr2cwf1jCgGU3G2Td/x5OQYWij6mUBWFEyMgqWxwGeOpgjPwTBuvewPARpUah Rc5Q== X-Gm-Message-State: ALoCoQn9ZHZugfo4+3aqfiTwN5gneGkiKn8eKERPXT2x6zmk51xndlO7G2YWuiLfFvu6L/7xVuJS X-Received: by 10.58.141.200 with SMTP id rq8mr2556598veb.31.1396593836145; Thu, 03 Apr 2014 23:43:56 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.108.97 with SMTP id i88ls438573qgf.78.gmail; Thu, 03 Apr 2014 23:43:56 -0700 (PDT) X-Received: by 10.52.191.100 with SMTP id gx4mr9842766vdc.4.1396593836042; Thu, 03 Apr 2014 23:43:56 -0700 (PDT) Received: from mail-vc0-f172.google.com (mail-vc0-f172.google.com [209.85.220.172]) by mx.google.com with ESMTPS id eh16si1647170vcb.18.2014.04.03.23.43.56 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 03 Apr 2014 23:43:56 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.172 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.172; Received: by mail-vc0-f172.google.com with SMTP id la4so2790537vcb.17 for ; Thu, 03 Apr 2014 23:43:55 -0700 (PDT) X-Received: by 10.52.147.238 with SMTP id tn14mr9791973vdb.23.1396593835932; Thu, 03 Apr 2014 23:43:55 -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 v8csp89363vcv; Thu, 3 Apr 2014 23:43:54 -0700 (PDT) X-Received: by 10.68.189.5 with SMTP id ge5mr13014664pbc.42.1396593833727; Thu, 03 Apr 2014 23:43:53 -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.36; Thu, 03 Apr 2014 23:43:36 -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 S1752883AbaDDGmn (ORCPT + 27 others); Fri, 4 Apr 2014 02:42:43 -0400 Received: from mail-wg0-f48.google.com ([74.125.82.48]:57866 "EHLO mail-wg0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752546AbaDDGmi (ORCPT ); Fri, 4 Apr 2014 02:42:38 -0400 Received: by mail-wg0-f48.google.com with SMTP id l18so2964498wgh.7 for ; Thu, 03 Apr 2014 23:42:37 -0700 (PDT) X-Received: by 10.180.78.200 with SMTP id d8mr1824239wix.34.1396593757021; Thu, 03 Apr 2014 23:42:37 -0700 (PDT) Received: from localhost ([213.122.173.131]) by mx.google.com with ESMTPSA id jd2sm2720207wic.9.2014.04.03.23.42.33 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 03 Apr 2014 23:42:36 -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 29/36] hrtimer: remove 'base' parameter from switch_hrtimer_base() Date: Fri, 4 Apr 2014 12:06:12 +0530 Message-Id: <572cbf109770a5b8fc9f595d73145a73721a5e0f.1396592516.git.viresh.kumar@linaro.org> 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.172 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 switch_hrtimer_base() never gets anything else than timer->base as its parameter. And so this routines doesn't require this parameter. Remove it. Signed-off-by: Viresh Kumar --- kernel/hrtimer.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c index a404436..c35dc36 100644 --- a/kernel/hrtimer.c +++ b/kernel/hrtimer.c @@ -212,10 +212,9 @@ hrtimer_check_target(struct hrtimer *timer, struct hrtimer_clock_base *new_base) * Switch the timer base to the current CPU when possible. */ static inline struct hrtimer_clock_base * -switch_hrtimer_base(struct hrtimer *timer, struct hrtimer_clock_base *base, - int pinned) +switch_hrtimer_base(struct hrtimer *timer, int pinned) { - struct hrtimer_clock_base *new_base; + struct hrtimer_clock_base *new_base, *base = timer->base; struct hrtimer_cpu_base *new_cpu_base; int this_cpu = smp_processor_id(); int cpu = get_nohz_timer_target(pinned); @@ -267,7 +266,7 @@ lock_hrtimer_base(const struct hrtimer *timer, unsigned long *flags) return base; } -# define switch_hrtimer_base(t, b, p) (b) +# define switch_hrtimer_base(t, p) (t->base) #endif /* !CONFIG_SMP */ @@ -978,7 +977,7 @@ int __hrtimer_start_range_ns(struct hrtimer *timer, ktime_t tim, hrtimer_set_expires_range_ns(timer, tim, delta_ns); /* Switch the timer base, if necessary: */ - new_base = switch_hrtimer_base(timer, base, mode & HRTIMER_MODE_PINNED); + new_base = switch_hrtimer_base(timer, mode & HRTIMER_MODE_PINNED); timer_stats_hrtimer_set_start_info(timer);