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
This commit is contained in:
commit
dc5ef1f569
|
@ -247,9 +247,8 @@ static struct lm63_data *lm63_update_device(struct device *dev)
|
||||||
|
|
||||||
mutex_lock(&data->update_lock);
|
mutex_lock(&data->update_lock);
|
||||||
|
|
||||||
next_update = data->last_updated
|
next_update = data->last_updated +
|
||||||
+ msecs_to_jiffies(data->update_interval) + 1;
|
msecs_to_jiffies(data->update_interval);
|
||||||
|
|
||||||
if (time_after(jiffies, next_update) || !data->valid) {
|
if (time_after(jiffies, next_update) || !data->valid) {
|
||||||
if (data->config & 0x04) { /* tachometer enabled */
|
if (data->config & 0x04) { /* tachometer enabled */
|
||||||
/* order matters for fan1_input */
|
/* order matters for fan1_input */
|
||||||
|
|
|
@ -470,8 +470,8 @@ static struct lm90_data *lm90_update_device(struct device *dev)
|
||||||
|
|
||||||
mutex_lock(&data->update_lock);
|
mutex_lock(&data->update_lock);
|
||||||
|
|
||||||
next_update = data->last_updated
|
next_update = data->last_updated +
|
||||||
+ msecs_to_jiffies(data->update_interval) + 1;
|
msecs_to_jiffies(data->update_interval);
|
||||||
if (time_after(jiffies, next_update) || !data->valid) {
|
if (time_after(jiffies, next_update) || !data->valid) {
|
||||||
u8 h, l;
|
u8 h, l;
|
||||||
u8 alarms;
|
u8 alarms;
|
||||||
|
|
Loading…
Reference in a new issue