summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/hwmon/ibmaem.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/hwmon/ibmaem.c b/drivers/hwmon/ibmaem.c
index 632f1dc0fe1f..7a8a6fbf11ff 100644
--- a/drivers/hwmon/ibmaem.c
+++ b/drivers/hwmon/ibmaem.c
@@ -842,11 +842,10 @@ static ssize_t aem_show_power(struct device *dev,
842 struct aem_data *data = dev_get_drvdata(dev); 842 struct aem_data *data = dev_get_drvdata(dev);
843 u64 before, after, delta, time; 843 u64 before, after, delta, time;
844 signed long leftover; 844 signed long leftover;
845 struct timespec b, a;
846 845
847 mutex_lock(&data->lock); 846 mutex_lock(&data->lock);
848 update_aem_energy_one(data, attr->index); 847 update_aem_energy_one(data, attr->index);
849 getnstimeofday(&b); 848 time = ktime_get_ns();
850 before = data->energy[attr->index]; 849 before = data->energy[attr->index];
851 850
852 leftover = schedule_timeout_interruptible( 851 leftover = schedule_timeout_interruptible(
@@ -858,11 +857,10 @@ static ssize_t aem_show_power(struct device *dev,
858 } 857 }
859 858
860 update_aem_energy_one(data, attr->index); 859 update_aem_energy_one(data, attr->index);
861 getnstimeofday(&a); 860 time = ktime_get_ns() - time;
862 after = data->energy[attr->index]; 861 after = data->energy[attr->index];
863 mutex_unlock(&data->lock); 862 mutex_unlock(&data->lock);
864 863
865 time = timespec_to_ns(&a) - timespec_to_ns(&b);
866 delta = (after - before) * UJ_PER_MJ; 864 delta = (after - before) * UJ_PER_MJ;
867 865
868 return sprintf(buf, "%llu\n", 866 return sprintf(buf, "%llu\n",