From patchwork Fri Apr 4 06:35:52 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 27741 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yh0-f69.google.com (mail-yh0-f69.google.com [209.85.213.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 0984D2036E for ; Fri, 4 Apr 2014 06:42:29 +0000 (UTC) Received: by mail-yh0-f69.google.com with SMTP id b6sf8474421yha.4 for ; Thu, 03 Apr 2014 23:42:29 -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=YaPYDfdJZauLAphfoR3dYaLjTW/dgbgIAetn7YgwGh8=; b=IStD7BSFjwFlyuEPMBayNsULu5ojY86uu3qxnVFUfqw+gA5HEeRYOIqDOiwkeGLhSp aqJld6TrgN8BgaoMyEKU79i/257CS00UqQznerS/yRWaayPG1ufXjwf4f/0ky9QZZ+Kh nKdNw6efx3TGN0KmUdfAKRSmynswaSF868VvaXoGH4P1xrpcuAvKJJHtaeQ1P7GmQqSK +At+e8AedA+9ZuZMj62dNe/uz+ltMqVsYlaU/ZyeKNPAh3yQ7WTZs6ttHHdjRE6i6C1N QWuQwNUACKyDfoJDV+phEqDjlKB9l4NaCZ81vji2hFecHR238euPWvSfR8Zom8DENEno G+Pg== X-Gm-Message-State: ALoCoQml3ioXOWZcNJVN2hcXaPjAqLGZbeEXQcMSZQz1dx2jWbpy6eo5WbWykaw+oAXQSu2M7iyS X-Received: by 10.58.178.137 with SMTP id cy9mr2714629vec.34.1396593749813; Thu, 03 Apr 2014 23:42:29 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.104.116 with SMTP id z107ls783455qge.37.gmail; Thu, 03 Apr 2014 23:42:29 -0700 (PDT) X-Received: by 10.220.159.4 with SMTP id h4mr6829713vcx.1.1396593749752; Thu, 03 Apr 2014 23:42:29 -0700 (PDT) Received: from mail-vc0-f174.google.com (mail-vc0-f174.google.com [209.85.220.174]) by mx.google.com with ESMTPS id cb3si1644505vdc.5.2014.04.03.23.42.29 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 03 Apr 2014 23:42:29 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.174 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.174; Received: by mail-vc0-f174.google.com with SMTP id ld13so2729984vcb.5 for ; Thu, 03 Apr 2014 23:42:29 -0700 (PDT) X-Received: by 10.52.51.197 with SMTP id m5mr9877527vdo.9.1396593749667; Thu, 03 Apr 2014 23:42:29 -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 v8csp89272vcv; Thu, 3 Apr 2014 23:42:29 -0700 (PDT) X-Received: by 10.67.8.102 with SMTP id dj6mr13016727pad.10.1396593748383; Thu, 03 Apr 2014 23:42:28 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id xt7si4198997pab.20.2014.04.03.23.42.27; Thu, 03 Apr 2014 23:42:27 -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 S1752520AbaDDGlR (ORCPT + 27 others); Fri, 4 Apr 2014 02:41:17 -0400 Received: from mail-wg0-f52.google.com ([74.125.82.52]:54833 "EHLO mail-wg0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751606AbaDDGkl (ORCPT ); Fri, 4 Apr 2014 02:40:41 -0400 Received: by mail-wg0-f52.google.com with SMTP id k14so2899470wgh.11 for ; Thu, 03 Apr 2014 23:40:40 -0700 (PDT) X-Received: by 10.181.13.11 with SMTP id eu11mr1815847wid.30.1396593640281; Thu, 03 Apr 2014 23:40:40 -0700 (PDT) Received: from localhost ([213.122.173.131]) by mx.google.com with ESMTPSA id l12sm11002758wjr.35.2014.04.03.23.40.36 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 03 Apr 2014 23:40:39 -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 09/36] hrtimer: call hrtimer_set_expires_range() from hrtimer_set_expires_range_ns() Date: Fri, 4 Apr 2014 12:05:52 +0530 Message-Id: <8cc3da5f4fa3ccacf0b47fb0386d14bd80cb5459.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.174 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: , hrtimer_set_expires_range() and hrtimer_set_expires_range_ns() have almost same implementations and so we can actually call hrtimer_set_expires_range() from hrtimer_set_expires_range_ns() internally instead of duplicating code. Signed-off-by: Viresh Kumar --- include/linux/hrtimer.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h index e7a8d3f..17c08ca 100644 --- a/include/linux/hrtimer.h +++ b/include/linux/hrtimer.h @@ -207,8 +207,7 @@ static inline void hrtimer_set_expires_range(struct hrtimer *timer, ktime_t time static inline void hrtimer_set_expires_range_ns(struct hrtimer *timer, ktime_t time, unsigned long delta) { - timer->_softexpires = time; - timer->node.expires = ktime_add_safe(time, ns_to_ktime(delta)); + hrtimer_set_expires_range(timer, time, ns_to_ktime(delta)); } static inline void hrtimer_set_expires_tv64(struct hrtimer *timer, s64 tv64)