diff options
author | Nicholas Mc Guire <hofrat@osadl.org> | 2015-02-09 14:09:09 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-03-25 06:36:38 -0400 |
commit | 2f9763190dd6356eec95548f4cfa8a36a71f767c (patch) | |
tree | 1a3bced068ff8da2b685eb7a9f7bf100f48f7e51 /drivers/misc | |
parent | 860cba13432e071442a39e9bab83258c631d33a6 (diff) |
misc: mic: fixup return type of wait_for_completion_timeout
return type of wait_for_completion_timeout is unsigned long not int. The
rc variable is renamed timeout to reflect its use and the type adjusted to
unsigned long.
Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>
Acked-by: Sudeep Dutt <sudeep.dutt@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc')
-rw-r--r-- | drivers/misc/mic/host/mic_boot.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/misc/mic/host/mic_boot.c b/drivers/misc/mic/host/mic_boot.c index ff2b0fb1a6be..d9fa609da061 100644 --- a/drivers/misc/mic/host/mic_boot.c +++ b/drivers/misc/mic/host/mic_boot.c | |||
@@ -309,7 +309,7 @@ void mic_complete_resume(struct mic_device *mdev) | |||
309 | */ | 309 | */ |
310 | void mic_prepare_suspend(struct mic_device *mdev) | 310 | void mic_prepare_suspend(struct mic_device *mdev) |
311 | { | 311 | { |
312 | int rc; | 312 | unsigned long timeout; |
313 | 313 | ||
314 | #define MIC_SUSPEND_TIMEOUT (60 * HZ) | 314 | #define MIC_SUSPEND_TIMEOUT (60 * HZ) |
315 | 315 | ||
@@ -331,10 +331,10 @@ void mic_prepare_suspend(struct mic_device *mdev) | |||
331 | */ | 331 | */ |
332 | mic_set_state(mdev, MIC_SUSPENDING); | 332 | mic_set_state(mdev, MIC_SUSPENDING); |
333 | mutex_unlock(&mdev->mic_mutex); | 333 | mutex_unlock(&mdev->mic_mutex); |
334 | rc = wait_for_completion_timeout(&mdev->reset_wait, | 334 | timeout = wait_for_completion_timeout(&mdev->reset_wait, |
335 | MIC_SUSPEND_TIMEOUT); | 335 | MIC_SUSPEND_TIMEOUT); |
336 | /* Force reset the card if the shutdown completion timed out */ | 336 | /* Force reset the card if the shutdown completion timed out */ |
337 | if (!rc) { | 337 | if (!timeout) { |
338 | mutex_lock(&mdev->mic_mutex); | 338 | mutex_lock(&mdev->mic_mutex); |
339 | mic_set_state(mdev, MIC_SUSPENDED); | 339 | mic_set_state(mdev, MIC_SUSPENDED); |
340 | mutex_unlock(&mdev->mic_mutex); | 340 | mutex_unlock(&mdev->mic_mutex); |
@@ -348,10 +348,10 @@ void mic_prepare_suspend(struct mic_device *mdev) | |||
348 | */ | 348 | */ |
349 | mic_set_state(mdev, MIC_SUSPENDED); | 349 | mic_set_state(mdev, MIC_SUSPENDED); |
350 | mutex_unlock(&mdev->mic_mutex); | 350 | mutex_unlock(&mdev->mic_mutex); |
351 | rc = wait_for_completion_timeout(&mdev->reset_wait, | 351 | timeout = wait_for_completion_timeout(&mdev->reset_wait, |
352 | MIC_SUSPEND_TIMEOUT); | 352 | MIC_SUSPEND_TIMEOUT); |
353 | /* Force reset the card if the shutdown completion timed out */ | 353 | /* Force reset the card if the shutdown completion timed out */ |
354 | if (!rc) | 354 | if (!timeout) |
355 | mic_stop(mdev, true); | 355 | mic_stop(mdev, true); |
356 | break; | 356 | break; |
357 | default: | 357 | default: |