soc/tegra: Watch wait_for_completion_timeout() return type
authorNicholas Mc Guire <hofrat@osadl.org>
Mon, 9 Mar 2015 07:12:26 +0000 (03:12 -0400)
committerThierry Reding <treding@nvidia.com>
Mon, 4 May 2015 10:58:18 +0000 (12:58 +0200)
The return type of the wait_for_completion_timeout() function is not int
but unsigned long. An appropriately named unsigned long is added and the
assignment fixed up.

Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>
Signed-off-by: Thierry Reding <treding@nvidia.com>
drivers/soc/tegra/fuse/fuse-tegra20.c

index 5eff6f097f980ceb1c5de96b114c7fc686663293..6acc2c44ee2c9afd70bf121786a7267819a86c88 100644 (file)
@@ -59,6 +59,7 @@ static u32 tegra20_fuse_readl(const unsigned int offset)
        int ret;
        u32 val = 0;
        struct dma_async_tx_descriptor *dma_desc;
+       unsigned long time_left;
 
        mutex_lock(&apb_dma_lock);
 
@@ -82,9 +83,10 @@ static u32 tegra20_fuse_readl(const unsigned int offset)
 
        dmaengine_submit(dma_desc);
        dma_async_issue_pending(apb_dma_chan);
-       ret = wait_for_completion_timeout(&apb_dma_wait, msecs_to_jiffies(50));
+       time_left = wait_for_completion_timeout(&apb_dma_wait,
+                                               msecs_to_jiffies(50));
 
-       if (WARN(ret == 0, "apb read dma timed out"))
+       if (WARN(time_left == 0, "apb read dma timed out"))
                dmaengine_terminate_all(apb_dma_chan);
        else
                val = *apb_buffer;