From patchwork Fri Apr 4 06:36:13 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 27755 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pd0-f198.google.com (mail-pd0-f198.google.com [209.85.192.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id B77972036E for ; Fri, 4 Apr 2014 06:43:58 +0000 (UTC) Received: by mail-pd0-f198.google.com with SMTP id fp1sf9807311pdb.5 for ; Thu, 03 Apr 2014 23:43:58 -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=MZJiR6u1aUf2vqXa0qw8nAn0tDLoTu9d9X+zKICrlso=; b=TjKwLXL7eVhMie9I8icBjca4TGOOoUkXZISiZ/R8gf9bS5PQhYHt+IJ2Hy43yCkmQH tcbhgTxX3jXXeTikZPHGAZMPXGFj4rnGzftAI1Y4W44HNvEBLOBZMm8EW+/uyO8jrJ6V pNHf8qHFGrblkpKnBHektu9BH1ygx3XFKC3vUWorvAI6c4iCzXnIFfHY+XQws7H2N5he TLv5Fta8O99QVBD4BlWWuXEAbfdEIYSFulHG4ytegtn+EmZgOPQaxL6pWVU6xBbm0gcy dhUGPdEdcqXKzjAJ2261vw55HNCVB927g3+wOBTxjGff8PE1R2hyrxK3DN6WG7papLlu lBJQ== X-Gm-Message-State: ALoCoQm6TRAZgFDa1RlJdU71BbTDUwVJpE3eJDFpWAminYn0WJvaLYwcKY7PMXTz2PEGX95D9okM X-Received: by 10.66.144.228 with SMTP id sp4mr3672223pab.5.1396593838026; Thu, 03 Apr 2014 23:43:58 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.22.167 with SMTP id 36ls879173qgn.55.gmail; Thu, 03 Apr 2014 23:43:57 -0700 (PDT) X-Received: by 10.52.51.197 with SMTP id m5mr9882207vdo.9.1396593837932; Thu, 03 Apr 2014 23:43:57 -0700 (PDT) Received: from mail-vc0-f180.google.com (mail-vc0-f180.google.com [209.85.220.180]) by mx.google.com with ESMTPS id ca6si1636272vcb.163.2014.04.03.23.43.57 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 03 Apr 2014 23:43:57 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.180 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.180; Received: by mail-vc0-f180.google.com with SMTP id lf12so2770247vcb.39 for ; Thu, 03 Apr 2014 23:43:57 -0700 (PDT) X-Received: by 10.52.0.193 with SMTP id 1mr9883327vdg.0.1396593837854; Thu, 03 Apr 2014 23:43:57 -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 v8csp89366vcv; Thu, 3 Apr 2014 23:43:56 -0700 (PDT) X-Received: by 10.66.192.73 with SMTP id he9mr12940402pac.88.1396593834462; Thu, 03 Apr 2014 23:43:54 -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.53; Thu, 03 Apr 2014 23:43:53 -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 S1752925AbaDDGmt (ORCPT + 27 others); Fri, 4 Apr 2014 02:42:49 -0400 Received: from mail-we0-f179.google.com ([74.125.82.179]:63259 "EHLO mail-we0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752875AbaDDGmn (ORCPT ); Fri, 4 Apr 2014 02:42:43 -0400 Received: by mail-we0-f179.google.com with SMTP id x48so2961588wes.10 for ; Thu, 03 Apr 2014 23:42:42 -0700 (PDT) X-Received: by 10.180.12.43 with SMTP id v11mr1716588wib.33.1396593762748; Thu, 03 Apr 2014 23:42:42 -0700 (PDT) Received: from localhost ([213.122.173.131]) by mx.google.com with ESMTPSA id fs8sm2718333wib.8.2014.04.03.23.42.39 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 03 Apr 2014 23:42:42 -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 30/36] hrtimer: remove 'base' parameter from enqueue_hrtimer() Date: Fri, 4 Apr 2014 12:06:13 +0530 Message-Id: <4918b29417bb8685a1c9e04ee91fbb6cb8820858.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.180 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 enqueue_hrtimer() 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 | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c index c35dc36..abbf155 100644 --- a/kernel/hrtimer.c +++ b/kernel/hrtimer.c @@ -867,9 +867,10 @@ EXPORT_SYMBOL_GPL(hrtimer_forward); * * Returns 1 when the new timer is the leftmost timer in the tree. */ -static int enqueue_hrtimer(struct hrtimer *timer, - struct hrtimer_clock_base *base) +static int enqueue_hrtimer(struct hrtimer *timer) { + struct hrtimer_clock_base *base = timer->base; + debug_activate(timer); timerqueue_add(&base->active, &timer->node); @@ -981,7 +982,7 @@ int __hrtimer_start_range_ns(struct hrtimer *timer, ktime_t tim, timer_stats_hrtimer_set_start_info(timer); - leftmost = enqueue_hrtimer(timer, new_base); + leftmost = enqueue_hrtimer(timer); /* * Only allow reprogramming if the new base is on this CPU. @@ -1210,8 +1211,7 @@ EXPORT_SYMBOL_GPL(hrtimer_get_res); static void __run_hrtimer(struct hrtimer *timer, ktime_t *now) { - struct hrtimer_clock_base *base = timer->base; - struct hrtimer_cpu_base *cpu_base = base->cpu_base; + struct hrtimer_cpu_base *cpu_base = timer->base->cpu_base; enum hrtimer_restart (*fn)(struct hrtimer *); int restart; @@ -1240,7 +1240,7 @@ static void __run_hrtimer(struct hrtimer *timer, ktime_t *now) */ if (restart != HRTIMER_NORESTART) { BUG_ON(timer->state != HRTIMER_STATE_CALLBACK); - enqueue_hrtimer(timer, base); + enqueue_hrtimer(timer); } WARN_ON_ONCE(!(timer->state & HRTIMER_STATE_CALLBACK)); @@ -1665,7 +1665,7 @@ static void migrate_hrtimer_list(struct hrtimer_clock_base *old_base, * sort out already expired timers and reprogram the * event device. */ - enqueue_hrtimer(timer, new_base); + enqueue_hrtimer(timer); /* Clear the migration state bit */ timer->state &= ~HRTIMER_STATE_MIGRATE;