aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2018-06-19 04:18:56 -0400
committerJacek Anaszewski <jacek.anaszewski@gmail.com>2018-06-19 16:38:29 -0400
commitd30c8d2031259d6dc360f8c96d362bb36665c99c (patch)
tree87b35031fafd1ecf4250e0859c43cfd8a13448ea
parentce397d215ccd07b8ae3f71db689aedb85d56ab40 (diff)
leds: ledtrig-activity: use ktime_get_boot_ns()
get_monotonic_boottime() is deprecated, so let's convert this to the simpler ktime_get_boot_ns(). Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Pavel Machek <pavel@ucw.cz> Signed-off-by: Jacek Anaszewski <jacek.anaszewski@gmail.com>
-rw-r--r--drivers/leds/trigger/ledtrig-activity.c5
1 files changed, 1 insertions, 4 deletions
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)
37 struct activity_data *activity_data = from_timer(activity_data, t, 37 struct activity_data *activity_data = from_timer(activity_data, t,
38 timer); 38 timer);
39 struct led_classdev *led_cdev = activity_data->led_cdev; 39 struct led_classdev *led_cdev = activity_data->led_cdev;
40 struct timespec boot_time;
41 unsigned int target; 40 unsigned int target;
42 unsigned int usage; 41 unsigned int usage;
43 int delay; 42 int delay;
@@ -57,8 +56,6 @@ static void led_activity_function(struct timer_list *t)
57 return; 56 return;
58 } 57 }
59 58
60 get_monotonic_boottime(&boot_time);
61
62 cpus = 0; 59 cpus = 0;
63 curr_used = 0; 60 curr_used = 0;
64 61
@@ -76,7 +73,7 @@ static void led_activity_function(struct timer_list *t)
76 * down to 16us, ensuring we won't overflow 32-bit computations below 73 * down to 16us, ensuring we won't overflow 32-bit computations below
77 * even up to 3k CPUs, while keeping divides cheap on smaller systems. 74 * even up to 3k CPUs, while keeping divides cheap on smaller systems.
78 */ 75 */
79 curr_boot = timespec_to_ns(&boot_time) * cpus; 76 curr_boot = ktime_get_boot_ns() * cpus;
80 diff_boot = (curr_boot - activity_data->last_boot) >> 16; 77 diff_boot = (curr_boot - activity_data->last_boot) >> 16;
81 diff_used = (curr_used - activity_data->last_used) >> 16; 78 diff_used = (curr_used - activity_data->last_used) >> 16;
82 activity_data->last_boot = curr_boot; 79 activity_data->last_boot = curr_boot;