Commit 706d5b28 authored by Nicholas Mc Guire's avatar Nicholas Mc Guire Committed by Brian Norris

mtd: nand: gpmi: fixup return type of wait_for_completion_timeout

return type of wait_for_completion_timeout is unsigned long not int. The
return variable is renamed to reflect its use and the type adjusted to
unsigned long.
Signed-off-by: default avatarNicholas Mc Guire <hofrat@osadl.org>
Reviewed-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
Acked-by: default avatarHuang Shijie <shijie.huang@intel.com>
Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
parent 219a8d13
...@@ -446,7 +446,7 @@ int start_dma_without_bch_irq(struct gpmi_nand_data *this, ...@@ -446,7 +446,7 @@ int start_dma_without_bch_irq(struct gpmi_nand_data *this,
struct dma_async_tx_descriptor *desc) struct dma_async_tx_descriptor *desc)
{ {
struct completion *dma_c = &this->dma_done; struct completion *dma_c = &this->dma_done;
int err; unsigned long timeout;
init_completion(dma_c); init_completion(dma_c);
...@@ -456,8 +456,8 @@ int start_dma_without_bch_irq(struct gpmi_nand_data *this, ...@@ -456,8 +456,8 @@ int start_dma_without_bch_irq(struct gpmi_nand_data *this,
dma_async_issue_pending(get_dma_chan(this)); dma_async_issue_pending(get_dma_chan(this));
/* Wait for the interrupt from the DMA block. */ /* Wait for the interrupt from the DMA block. */
err = wait_for_completion_timeout(dma_c, msecs_to_jiffies(1000)); timeout = wait_for_completion_timeout(dma_c, msecs_to_jiffies(1000));
if (!err) { if (!timeout) {
dev_err(this->dev, "DMA timeout, last DMA :%d\n", dev_err(this->dev, "DMA timeout, last DMA :%d\n",
this->last_dma_type); this->last_dma_type);
gpmi_dump_info(this); gpmi_dump_info(this);
...@@ -477,7 +477,7 @@ int start_dma_with_bch_irq(struct gpmi_nand_data *this, ...@@ -477,7 +477,7 @@ int start_dma_with_bch_irq(struct gpmi_nand_data *this,
struct dma_async_tx_descriptor *desc) struct dma_async_tx_descriptor *desc)
{ {
struct completion *bch_c = &this->bch_done; struct completion *bch_c = &this->bch_done;
int err; unsigned long timeout;
/* Prepare to receive an interrupt from the BCH block. */ /* Prepare to receive an interrupt from the BCH block. */
init_completion(bch_c); init_completion(bch_c);
...@@ -486,8 +486,8 @@ int start_dma_with_bch_irq(struct gpmi_nand_data *this, ...@@ -486,8 +486,8 @@ int start_dma_with_bch_irq(struct gpmi_nand_data *this,
start_dma_without_bch_irq(this, desc); start_dma_without_bch_irq(this, desc);
/* Wait for the interrupt from the BCH block. */ /* Wait for the interrupt from the BCH block. */
err = wait_for_completion_timeout(bch_c, msecs_to_jiffies(1000)); timeout = wait_for_completion_timeout(bch_c, msecs_to_jiffies(1000));
if (!err) { if (!timeout) {
dev_err(this->dev, "BCH timeout, last DMA :%d\n", dev_err(this->dev, "BCH timeout, last DMA :%d\n",
this->last_dma_type); this->last_dma_type);
gpmi_dump_info(this); gpmi_dump_info(this);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment