Selaa lähdekoodia

soc/tegra: Watch wait_for_completion_timeout() return type

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>
Nicholas Mc Guire 10 vuotta sitten
vanhempi
commit
039aa4d680
1 muutettua tiedostoa jossa 4 lisäystä ja 2 poistoa
  1. 4 2
      drivers/soc/tegra/fuse/fuse-tegra20.c

+ 4 - 2
drivers/soc/tegra/fuse/fuse-tegra20.c

@@ -59,6 +59,7 @@ static u32 tegra20_fuse_readl(const unsigned int offset)
 	int ret;
 	int ret;
 	u32 val = 0;
 	u32 val = 0;
 	struct dma_async_tx_descriptor *dma_desc;
 	struct dma_async_tx_descriptor *dma_desc;
+	unsigned long time_left;
 
 
 	mutex_lock(&apb_dma_lock);
 	mutex_lock(&apb_dma_lock);
 
 
@@ -82,9 +83,10 @@ static u32 tegra20_fuse_readl(const unsigned int offset)
 
 
 	dmaengine_submit(dma_desc);
 	dmaengine_submit(dma_desc);
 	dma_async_issue_pending(apb_dma_chan);
 	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);
 		dmaengine_terminate_all(apb_dma_chan);
 	else
 	else
 		val = *apb_buffer;
 		val = *apb_buffer;