From patchwork Tue Jun 19 08:18:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 139100 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp4919104lji; Tue, 19 Jun 2018 01:22:54 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJ9WLIWkox9JuaH60CDJqwBAr2QhFOy31qq0gVWm5GTaJKRChM63UysG0/Ivp7CmTRLnt5t X-Received: by 2002:a17:902:bb8a:: with SMTP id m10-v6mr17719209pls.236.1529396574537; Tue, 19 Jun 2018 01:22:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529396574; cv=none; d=google.com; s=arc-20160816; b=n/TC0o0tJPI69Mc43FH6tMCaph/3XhHaZJFzDSxpBTEt0SGymCn56PD2DrM0TVwyqI rNSqMDtAzhHUCMgcu4/P3qa8TSYBFBHabu2Y5cH6sWfJ5Syi7ncpmxnMBESrjcHEnVad i/CsWXoaRrnIwRPONYw+fJAs+Ytx57rpgxzRGZNrLqVttGyLv8JP8K5DMdZ30KhYt23H WmrTg0Fuex1QSD5gtfZM+fiXUbBGRJwkIZgASoSqnX6dB/+xpbwIo2o7c5M2FDlohj4s SH2XilplZtHris5sQHkDoNZmqh04sDdZsJKs/h6jmTYFssVZh91y6FlSC/gB0rMy5S5l QgMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=pYwUKQ3nSdVzQf8Hpne5+eedXdEQS6EBL0vLUCGtcmU=; b=uEvuod7r3mtQMIGf0IlSOhGMULY3+S0FCrKJCDWwBFZKRiX58zcd9m5knWUrbtmA6F HFAq2oC/eu3fJ5vsZU5ostRuXx6QzFck+In+e/Hk9JttHZ9AnzJEb+wXg5/lTXXKL4OG eiuLhn63JmcjWoaNjDYC8ZdfZqo00QG++1lRDL9sji6FKcdAMTbhLGhMcaKQiGmc4+WY OA3gP+R51Zo0yCHD9+ocfDC8C/QGQZaqApqUfSSimVA1S4N3ECD41stVFys0B62G5lL7 zJg5+ap7/4Sd5zNDF8FapRjhXm39Li5tTo3bME/XI9fM5txq0CfoicwsedzpAjwEUM3s bvOA== 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 v1-v6si16846434ply.458.2018.06.19.01.22.54; Tue, 19 Jun 2018 01:22: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; 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 S1756484AbeFSIWv (ORCPT + 30 others); Tue, 19 Jun 2018 04:22:51 -0400 Received: from mout.kundenserver.de ([212.227.17.10]:50825 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756451AbeFSIWt (ORCPT ); Tue, 19 Jun 2018 04:22:49 -0400 Received: from wuerfel.lan ([95.208.111.237]) by mrelayeu.kundenserver.de (mreue104 [212.227.15.145]) with ESMTPA (Nemesis) id 0Md4Bm-1fnPVr0NSU-00IFt7; Tue, 19 Jun 2018 10:22:25 +0200 From: Arnd Bergmann To: Jacek Anaszewski , Pavel Machek Cc: y2038@lists.linaro.org, Arnd Bergmann , Willy Tarreau , linux-leds@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] [v2] leds: ledtrig-activity: use ktime_get_boot_ns() Date: Tue, 19 Jun 2018 10:18:56 +0200 Message-Id: <20180619082215.2990745-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K1:6B9Kc0gW1wWG6RrWqxclm+xuFsTarDW1MoaWpneIQ7FF45wS/7I uyyFueouU4q2nhevhMOvyMOxF3iQZ2zHzubvBfpg3pePplCn5SaJQagaRe3N1X0WGGZ5Ki3 Qnaa1sNfOKqGGNolMufY2lF4eSnK/vMbJT9W5lk2rLjpUSzSEw5+YMeu9T6Bn1yMqeSwaMQ kjblgsfE96MLIEB8FtroA== X-UI-Out-Filterresults: notjunk:1; V01:K0:ByOyyQaY3tc=:c0fxuJZ6ei8JoLHqidmJYk DD1aHM2feWvhcLAG+zhlmEKX1LydSp6gYm9vIdg0+Wz7vgZJJJkuke7OSbDaIIPuQKoEugE+/ Tvap5C2bvcal86a7ND5DhNyMR/4oSW4sTUeSbWqw7VoTSGrFlpSX3uwvNYcBTiKptruBZt55o NJp5Mf8YnZaL/y9wU2jWuzcjgELXb56WEVW3aGOHDi6uX16kImX8TAMogvSJwjiiYvD5CbSB+ KIg3Kq2Gc5TkxdGRwbdePbRY+xagQToW0mEovDpalQY1k4OG/P+aUddbFw45JFQHKxWJl68gq Nadr9aFJ6SuC3uZmgxKYbdP0EdSmSktshbuoHVD/+lZr4h3dDQjcpFfIGbMv0+24n/qYZmyge NHkMZdpg4y5w1e1Gqq+JTTswMtw/M5NaJ0O7cMMW4Tdsglpy6Vr3sm0kQVfU0q+mEu4yVS4JF PSwZkyXHe/zJIB/vM4aPayyQxdlM03+P6W2Gecwy3hIzXqqg4I5tLsD7eQ7OGL3VaI2Rq+bAY 73HM5wXzENd7rnGc5l5+PG1UwXdipxror1TTTc4HPPmZJ4aOQN73u/67p+vUD+KIivwmWYroj MvpboScuFuk/KNf1LZnY//aKXCBsZmKUdn670zlBGEKLKfV8zEmUwO7uKJKoJaE3z6q8xUTPS GweTrs8AYMswURZcibmEpwWuavjaXj9aXYDX5MdWBkdodcCGB3Tw0aZKQaEyZQmNMFAI= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org get_monotonic_boottime() is deprecated, so let's convert this to the simpler ktime_get_boot_ns(). Signed-off-by: Arnd Bergmann --- v2: don't drop 'cpus' multiplication, as Pavel and Willy point out that needs to be kept --- drivers/leds/trigger/ledtrig-activity.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) -- 2.9.0 diff --git a/drivers/leds/trigger/ledtrig-activity.c b/drivers/leds/trigger/ledtrig-activity.c index 5081894082bd..6c6f8a9b8d9a 100644 --- a/drivers/leds/trigger/ledtrig-activity.c +++ b/drivers/leds/trigger/ledtrig-activity.c @@ -37,7 +37,6 @@ static void led_activity_function(struct timer_list *t) struct activity_data *activity_data = from_timer(activity_data, t, timer); struct led_classdev *led_cdev = activity_data->led_cdev; - struct timespec boot_time; unsigned int target; unsigned int usage; int delay; @@ -57,8 +56,6 @@ static void led_activity_function(struct timer_list *t) return; } - get_monotonic_boottime(&boot_time); - cpus = 0; curr_used = 0; @@ -76,7 +73,7 @@ static void led_activity_function(struct timer_list *t) * down to 16us, ensuring we won't overflow 32-bit computations below * even up to 3k CPUs, while keeping divides cheap on smaller systems. */ - curr_boot = timespec_to_ns(&boot_time) * cpus; + curr_boot = ktime_get_boot_ns() * cpus; diff_boot = (curr_boot - activity_data->last_boot) >> 16; diff_used = (curr_used - activity_data->last_used) >> 16; activity_data->last_boot = curr_boot;