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: Nicholas Mc Guire <hofrat@osadl.org>
Reviewed-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Acked-by: Huang Shijie <shijie.huang@intel.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
struct dma_async_tx_descriptor *desc)
{
struct completion *dma_c = &this->dma_done;
struct dma_async_tx_descriptor *desc)
{
struct completion *dma_c = &this->dma_done;
dma_async_issue_pending(get_dma_chan(this));
/* Wait for the interrupt from the DMA block. */
dma_async_issue_pending(get_dma_chan(this));
/* Wait for the interrupt from the DMA block. */
- err = wait_for_completion_timeout(dma_c, msecs_to_jiffies(1000));
- if (!err) {
+ timeout = wait_for_completion_timeout(dma_c, msecs_to_jiffies(1000));
+ if (!timeout) {
dev_err(this->dev, "DMA timeout, last DMA :%d\n",
this->last_dma_type);
gpmi_dump_info(this);
dev_err(this->dev, "DMA timeout, last DMA :%d\n",
this->last_dma_type);
gpmi_dump_info(this);
struct dma_async_tx_descriptor *desc)
{
struct completion *bch_c = &this->bch_done;
struct dma_async_tx_descriptor *desc)
{
struct completion *bch_c = &this->bch_done;
/* Prepare to receive an interrupt from the BCH block. */
init_completion(bch_c);
/* Prepare to receive an interrupt from the BCH block. */
init_completion(bch_c);
start_dma_without_bch_irq(this, desc);
/* Wait for the interrupt from the BCH block. */
start_dma_without_bch_irq(this, desc);
/* Wait for the interrupt from the BCH block. */
- err = wait_for_completion_timeout(bch_c, msecs_to_jiffies(1000));
- if (!err) {
+ timeout = wait_for_completion_timeout(bch_c, msecs_to_jiffies(1000));
+ if (!timeout) {
dev_err(this->dev, "BCH timeout, last DMA :%d\n",
this->last_dma_type);
gpmi_dump_info(this);
dev_err(this->dev, "BCH timeout, last DMA :%d\n",
this->last_dma_type);
gpmi_dump_info(this);