hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Nicholas Mc Guire 2015-02-09 14:09:09 -05:00 committed by Greg Kroah-Hartman
parent 860cba1343
commit 2f9763190d
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/misc/mic/host/mic_boot.c
View File

@ -309,7 +309,7 @@ void mic_complete_resume(struct mic_device *mdev)
*/ */
void mic_prepare_suspend(struct mic_device *mdev) void mic_prepare_suspend(struct mic_device *mdev)
{ {
int rc; unsigned long timeout;
#define MIC_SUSPEND_TIMEOUT (60 * HZ) #define MIC_SUSPEND_TIMEOUT (60 * HZ)
@ -331,10 +331,10 @@ void mic_prepare_suspend(struct mic_device *mdev)
*/ */
mic_set_state(mdev, MIC_SUSPENDING); mic_set_state(mdev, MIC_SUSPENDING);
mutex_unlock(&mdev->mic_mutex); mutex_unlock(&mdev->mic_mutex);
rc = wait_for_completion_timeout(&mdev->reset_wait, timeout = wait_for_completion_timeout(&mdev->reset_wait,
MIC_SUSPEND_TIMEOUT); MIC_SUSPEND_TIMEOUT);
/* Force reset the card if the shutdown completion timed out */ /* Force reset the card if the shutdown completion timed out */
if (!rc) { if (!timeout) {
mutex_lock(&mdev->mic_mutex); mutex_lock(&mdev->mic_mutex);
mic_set_state(mdev, MIC_SUSPENDED); mic_set_state(mdev, MIC_SUSPENDED);
mutex_unlock(&mdev->mic_mutex); mutex_unlock(&mdev->mic_mutex);
@ -348,10 +348,10 @@ void mic_prepare_suspend(struct mic_device *mdev)
*/ */
mic_set_state(mdev, MIC_SUSPENDED); mic_set_state(mdev, MIC_SUSPENDED);
mutex_unlock(&mdev->mic_mutex); mutex_unlock(&mdev->mic_mutex);
rc = wait_for_completion_timeout(&mdev->reset_wait, timeout = wait_for_completion_timeout(&mdev->reset_wait,
MIC_SUSPEND_TIMEOUT); MIC_SUSPEND_TIMEOUT);
/* Force reset the card if the shutdown completion timed out */ /* Force reset the card if the shutdown completion timed out */
if (!rc) if (!timeout)
mic_stop(mdev, true); mic_stop(mdev, true);
break; break;
default: default: