Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
Pull hwmon update from Jean Delvare.
* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
hwmon: (lm63) Drop redundant safety on cache lifetime
hwmon: (lm90) Drop redundant safety on cache lifetime
+4
-5
+2
-3
drivers/hwmon/lm63.c
+2
-3
drivers/hwmon/lm63.c
···
247
247
248
248
mutex_lock(&data->update_lock);
249
249
250
-
next_update = data->last_updated
251
-
+ msecs_to_jiffies(data->update_interval) + 1;
252
-
250
+
next_update = data->last_updated +
251
+
msecs_to_jiffies(data->update_interval);
253
252
if (time_after(jiffies, next_update) || !data->valid) {
254
253
if (data->config & 0x04) { /* tachometer enabled */
255
254
/* order matters for fan1_input */
+2
-2
drivers/hwmon/lm90.c
+2
-2
drivers/hwmon/lm90.c
···
470
470
471
471
mutex_lock(&data->update_lock);
472
472
473
-
next_update = data->last_updated
474
-
+ msecs_to_jiffies(data->update_interval) + 1;
473
+
next_update = data->last_updated +
474
+
msecs_to_jiffies(data->update_interval);
475
475
if (time_after(jiffies, next_update) || !data->valid) {
476
476
u8 h, l;
477
477
u8 alarms;