evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

regulator: cpr3: Fix 32-bit compilation

Browse source 
Fix errors reported in 32-bit compilation.

Change-Id: Ic2c03bd396e3f6668aa4d0c7b6ae9b99fa896367
Signed-off-by: Tirupathi Reddy <tirupath@codeaurora.org>
This commit is contained in:
Tirupathi Reddy 2016-01-14 15:58:01 +05:30 • committed by David Keitel
parent 3b6a8823f2
commit 223bce035c
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/regulator/cpr3-regulator.c
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, The Linux Foundation. All rights reserved.
* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@ -2087,7 +2087,7 @@ static int cpr3_regulator_wait_for_idle(struct cpr3_controller *ctrl,
time_ns = ktime_to_ns(ktime_sub(end, start));
if (time_ns > max_wait_ns) {
cpr3_err(ctrl, "CPR controller still busy after %lld us\n",
time_ns / 1000);
div_s64(time_ns, 1000));
return -ETIMEDOUT;
}
usleep_range(50, 100);

10
drivers/regulator/cpr3-util.c
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, The Linux Foundation. All rights reserved.
* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@ -329,7 +329,7 @@ int cpr3_parse_array_property(struct cpr3_regulator *vreg,
offset = tuple_size * vreg->speed_bin_fuse;
} else {
if (vreg->speed_bins_supported > 0)
cpr3_err(vreg, "property %s has invalid length=%d, should be %lu, %lu, or %lu\n",
cpr3_err(vreg, "property %s has invalid length=%d, should be %zu, %zu, or %zu\n",
prop_name, len,
tuple_size * sizeof(u32),
tuple_size * vreg->speed_bins_supported
@ -337,7 +337,7 @@ int cpr3_parse_array_property(struct cpr3_regulator *vreg,
tuple_size * vreg->fuse_combos_supported
* sizeof(u32));
else
cpr3_err(vreg, "property %s has invalid length=%d, should be %lu or %lu\n",
cpr3_err(vreg, "property %s has invalid length=%d, should be %zu or %zu\n",
prop_name, len,
tuple_size * sizeof(u32),
tuple_size * vreg->fuse_combos_supported
@ -404,7 +404,7 @@ int cpr3_parse_corner_array_property(struct cpr3_regulator *vreg,
offset = tuple_size * vreg->speed_bin_offset;
} else {
if (vreg->speed_bin_corner_sum > 0)
cpr3_err(vreg, "property %s has invalid length=%d, should be %lu, %lu, or %lu\n",
cpr3_err(vreg, "property %s has invalid length=%d, should be %zu, %zu, or %zu\n",
prop_name, len,
tuple_size * vreg->corner_count * sizeof(u32),
tuple_size * vreg->speed_bin_corner_sum
@ -412,7 +412,7 @@ int cpr3_parse_corner_array_property(struct cpr3_regulator *vreg,
tuple_size * vreg->fuse_combo_corner_sum
* sizeof(u32));
else
cpr3_err(vreg, "property %s has invalid length=%d, should be %lu or %lu\n",
cpr3_err(vreg, "property %s has invalid length=%d, should be %zu or %zu\n",
prop_name, len,
tuple_size * vreg->corner_count * sizeof(u32),
tuple_size * vreg->fuse_combo_corner_sum