diff options
author | Dave Airlie <airlied@redhat.com> | 2015-05-20 16:23:53 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2015-05-20 16:23:53 +1000 |
commit | bdcddf95e82b1c4e370fc1196b1f4f50f775dab4 (patch) | |
tree | ef2af2b3faee1f8e8287ca45d265809f56fbd0f6 /drivers/iio/adc/qcom-spmi-vadc.c | |
parent | 91d9f9856f91c82ac6289a0fff65dd12cfa07e34 (diff) | |
parent | e26081808edadfd257c6c9d81014e3b25e9a6118 (diff) |
Backmerge v4.1-rc4 into into drm-next
We picked up a silent conflict in amdkfd with drm-fixes and drm-next,
backmerge v4.1-rc5 and fix the conflicts
Signed-off-by: Dave Airlie <airlied@redhat.com>
Conflicts:
drivers/gpu/drm/drm_irq.c
Diffstat (limited to 'drivers/iio/adc/qcom-spmi-vadc.c')
-rw-r--r-- | drivers/iio/adc/qcom-spmi-vadc.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/iio/adc/qcom-spmi-vadc.c b/drivers/iio/adc/qcom-spmi-vadc.c index 3211729bcb0b..0c4618b4d515 100644 --- a/drivers/iio/adc/qcom-spmi-vadc.c +++ b/drivers/iio/adc/qcom-spmi-vadc.c @@ -18,6 +18,7 @@ #include <linux/iio/iio.h> #include <linux/interrupt.h> #include <linux/kernel.h> +#include <linux/math64.h> #include <linux/module.h> #include <linux/of.h> #include <linux/platform_device.h> @@ -471,11 +472,11 @@ static s32 vadc_calibrate(struct vadc_priv *vadc, const struct vadc_channel_prop *prop, u16 adc_code) { const struct vadc_prescale_ratio *prescale; - s32 voltage; + s64 voltage; voltage = adc_code - vadc->graph[prop->calibration].gnd; voltage *= vadc->graph[prop->calibration].dx; - voltage = voltage / vadc->graph[prop->calibration].dy; + voltage = div64_s64(voltage, vadc->graph[prop->calibration].dy); if (prop->calibration == VADC_CALIB_ABSOLUTE) voltage += vadc->graph[prop->calibration].dx; @@ -487,7 +488,7 @@ static s32 vadc_calibrate(struct vadc_priv *vadc, voltage = voltage * prescale->den; - return voltage / prescale->num; + return div64_s64(voltage, prescale->num); } static int vadc_decimation_from_dt(u32 value) |