* [PATCH 1/2] ab8500_fg: match return type of wait_for_completion_timeout
@ 2015-02-09 17:20 Nicholas Mc Guire
2015-02-25 21:47 ` Sebastian Reichel
0 siblings, 1 reply; 2+ messages in thread
From: Nicholas Mc Guire @ 2015-02-09 17:20 UTC (permalink / raw)
To: Sebastian Reichel
Cc: Dmitry Eremin-Solenikov, David Woodhouse, linux-pm, linux-kernel,
Nicholas Mc Guire
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>
---
Patch was only compile tested with u8500_defconfig + CONFIG_AB8500_BM=y
Patch is against 3.19.0-rc7 (localversion-next is -next-20150209)
drivers/power/ab8500_fg.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/power/ab8500_fg.c b/drivers/power/ab8500_fg.c
index c908658..eee4493 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);
--
1.7.10.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 1/2] ab8500_fg: match return type of wait_for_completion_timeout
2015-02-09 17:20 [PATCH 1/2] ab8500_fg: match return type of wait_for_completion_timeout Nicholas Mc Guire
@ 2015-02-25 21:47 ` Sebastian Reichel
0 siblings, 0 replies; 2+ messages in thread
From: Sebastian Reichel @ 2015-02-25 21:47 UTC (permalink / raw)
To: Nicholas Mc Guire
Cc: Dmitry Eremin-Solenikov, David Woodhouse, linux-pm, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 311 bytes --]
Hi,
On Mon, Feb 09, 2015 at 12:20:45PM -0500, Nicholas Mc Guire wrote:
> 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.
thanks, applied to battery-2.6.git.
-- Sebastian
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-02-25 21:47 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-02-09 17:20 [PATCH 1/2] ab8500_fg: match return type of wait_for_completion_timeout Nicholas Mc Guire
2015-02-25 21:47 ` Sebastian Reichel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).