Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp977373imu; Wed, 9 Jan 2019 09:25:17 -0800 (PST) X-Google-Smtp-Source: ALg8bN7jPFI1P7AcchorYjgZWJ6Tmyc3D+wvHl2Ur+pDBuvESBdhbz9+Ku9CTx5kplufo40BFV51 X-Received: by 2002:a17:902:850c:: with SMTP id bj12mr6755292plb.46.1547054717008; Wed, 09 Jan 2019 09:25:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547054716; cv=none; d=google.com; s=arc-20160816; b=DkWmIAGDwUlIUeA4h4FB0/JYmvosCKE5UR1XXcDlv+gvFcUjXF6ZeYMPOajkmUQ2ZB AH4401t8MNi/vo+xnqXHcNb3jcDem2c8o9ZGo0NaK++JgSeg26N82CPCbeKzH0+O7ozk MnMXm6LS/VVfPZ+XbUiZQihSnOnLafOOfcGFABdEY9rtmNNoC6+9/IYKpNh1PB060ckp gO9rTZJ4fAfPYHWckQyjZSrvjOXwtC8fe/3d/LRIAj2XN6I6ENkCWQp6BSyp5Qb1Y0/h km3yBprKHVk4NHrmVJKfdq+/7/sJ2vgqdoel+24HfsevGlY+SU4ZszFQ+4XQ9Epjxa+m sAdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:user-agent:content-disposition :mime-version:message-id:subject:cc:to:from:date; bh=sIElkR9NbdhfVUOMyduAMgzviLOag9h3RAnjx0UcmB8=; b=iZtlNxhZU67gaLdLITQJxr1e7h/qE8qZJxDz29tuZtcvsst1joxZch6kepB5cHLG4H g2QKuog1Hevl0lMANmEnddSmjBOaBiUMmFLwpGpywdILC9HNPxCTc1l/HsYCrk9hRYRw CUVlPpTRDFwb4BRLdUmZI5DN5Z0xufeoMBYE8nJijaMK5oSqWpfg/L2tGp6B+WGjcR7v aTgb9+IgNPxDuh5IY7IEQnxZZ0B+SoXVv3jWpQr7Be8G0Q3R3qONKibKxK4JiT4BYv1z QWktZ9PTGma/FIhQ/YJ+kh7efoI+cobaym1JshK35wWyeOzfT+j8WAvS/sO69TfTAwOe WVlg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e6si34053852pgd.428.2019.01.09.09.25.01; Wed, 09 Jan 2019 09:25:16 -0800 (PST) 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; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726921AbfAIRXn (ORCPT + 99 others); Wed, 9 Jan 2019 12:23:43 -0500 Received: from eddie.linux-mips.org ([148.251.95.138]:57772 "EHLO cvs.linux-mips.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726574AbfAIRXn (ORCPT ); Wed, 9 Jan 2019 12:23:43 -0500 Received: (from localhost user: 'ladis' uid#1021 fake: STDIN (ladis@eddie.linux-mips.org)) by eddie.linux-mips.org id S23993997AbfAIRXkz6Usf (ORCPT + 2 others); Wed, 9 Jan 2019 18:23:40 +0100 Date: Wed, 9 Jan 2019 18:23:36 +0100 From: Ladislav Michl To: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org, rjw@rjwysocki.net, ulf.hansson@linaro.org, tony@atomide.com Cc: Vincent Guittot Subject: [PATCH] PM/runtime: Fix 'jiffies' in comments after move to hrtimers Message-ID: <20190109172336.GA1711@lenoch> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org PM-runtime now uses the hrtimers infrastructure for autosuspend, however comments still reference 'jiffies'. Fixes: 8234f6734c5d ("PM-runtime: Switch autosuspend over to using hrtimers") Signed-off-by: Ladislav Michl --- drivers/base/power/runtime.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c index 70624695b6d5..096f7996d914 100644 --- a/drivers/base/power/runtime.c +++ b/drivers/base/power/runtime.c @@ -121,7 +121,7 @@ static void pm_runtime_cancel_pending(struct device *dev) * Compute the autosuspend-delay expiration time based on the device's * power.last_busy time. If the delay has already expired or is disabled * (negative) or the power.use_autosuspend flag isn't set, return 0. - * Otherwise return the expiration time in jiffies (adjusted to be nonzero). + * Otherwise return the expiration time in nanoseconds (adjusted to be nonzero). * * This function may be called either with or without dev->power.lock held. * Either way it can be racy, since power.last_busy may be updated at any time. @@ -905,7 +905,7 @@ static enum hrtimer_restart pm_suspend_timer_fn(struct hrtimer *timer) spin_lock_irqsave(&dev->power.lock, flags); expires = dev->power.timer_expires; - /* If 'expire' is after 'jiffies' we've been called too early. */ + /* If 'timer_expires' after 'now' we've been called too early. */ if (expires > 0 && expires < ktime_to_ns(ktime_get())) { dev->power.timer_expires = 0; rpm_suspend(dev, dev->power.timer_autosuspends ? -- 2.20.1