On Mon, 2015-02-09 at 14:09 -0500, Nicholas Mc Guire wrote:
> 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.
>
Acked-by: Sudeep Dutt <sudeep.d...@intel.com>
Thanks for the patch!
> Signed-off-by: Nicholas Mc Guire <hof...@osadl.org>
> ---
>
> Patch was only compile tested with x86_64_defconfig + CONFIG_INTEL_MIC_BUS=m
> CONFIG_INTEL_MIC_HOST=m
>
> Patch is against 3.19.0-rc7 (localversion-next is -next-20150209)
>
> drivers/misc/mic/host/mic_boot.c | 14 +++++++-------
> 1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/misc/mic/host/mic_boot.c
> b/drivers/misc/mic/host/mic_boot.c
> index ff2b0fb..d9fa609 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)
> */
> void mic_prepare_suspend(struct mic_device *mdev)
> {
> - int rc;
> + unsigned long timeout;
>
> #define MIC_SUSPEND_TIMEOUT (60 * HZ)
>
> @@ -331,10 +331,10 @@ void mic_prepare_suspend(struct mic_device *mdev)
> */
> mic_set_state(mdev, MIC_SUSPENDING);
> mutex_unlock(&mdev->mic_mutex);
> - rc = wait_for_completion_timeout(&mdev->reset_wait,
> - MIC_SUSPEND_TIMEOUT);
> + timeout = wait_for_completion_timeout(&mdev->reset_wait,
> + MIC_SUSPEND_TIMEOUT);
> /* Force reset the card if the shutdown completion timed out */
> - if (!rc) {
> + if (!timeout) {
> mutex_lock(&mdev->mic_mutex);
> mic_set_state(mdev, MIC_SUSPENDED);
> mutex_unlock(&mdev->mic_mutex);
> @@ -348,10 +348,10 @@ void mic_prepare_suspend(struct mic_device *mdev)
> */
> mic_set_state(mdev, MIC_SUSPENDED);
> mutex_unlock(&mdev->mic_mutex);
> - rc = wait_for_completion_timeout(&mdev->reset_wait,
> - MIC_SUSPEND_TIMEOUT);
> + timeout = wait_for_completion_timeout(&mdev->reset_wait,
> + MIC_SUSPEND_TIMEOUT);
> /* Force reset the card if the shutdown completion timed out */
> - if (!rc)
> + if (!timeout)
> mic_stop(mdev, true);
> break;
> default:
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
