summary refs log tree commit diff
path: root/drivers/power
diff options
context:
space:
mode:
authorNicholas Mc Guire <hofrat@osadl.org>2015-02-09 12:20:45 -0500
committerSebastian Reichel <sre@kernel.org>2015-02-25 22:47:12 +0100
commit5ae6e2a8f8008dffec3f9d48337ba0bc430a1211 (patch)
treea03f84386bf9940d15a56b29c6a32e1705ccae35 /drivers/power
parentc75cfa9e27818b67e55ef9153c3f4fb9c867f7f0 (diff)
downloadlinux-5ae6e2a8f8008dffec3f9d48337ba0bc430a1211.tar.gz
ab8500_fg: match return type of wait_for_completion_timeout
return type of wait_for_completion_timeout is unsigned long not int. as
timeout is used for wait_for_completion_timeout exclusively here its
type is simply changed to unsigned long.

Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>
Signed-off-by: Sebastian Reichel <sre@kernel.org>
Diffstat (limited to 'drivers/power')
-rw-r--r--drivers/power/ab8500_fg.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/power/ab8500_fg.c b/drivers/power/ab8500_fg.c
index 94d3b10a21ff..73288dac0521 100644
--- a/drivers/power/ab8500_fg.c
+++ b/drivers/power/ab8500_fg.c
@@ -622,7 +622,7 @@ int ab8500_fg_inst_curr_finalize(struct ab8500_fg *di, int *res)
 	u8 low, high;
 	int val;
 	int ret;
-	int timeout;
+	unsigned long timeout;
 
 	if (!completion_done(&di->ab8500_fg_complete)) {
 		timeout = wait_for_completion_timeout(
@@ -716,7 +716,7 @@ fail:
 int ab8500_fg_inst_curr_blocking(struct ab8500_fg *di)
 {
 	int ret;
-	int timeout;
+	unsigned long timeout;
 	int res = 0;
 
 	ret = ab8500_fg_inst_curr_start(di);