提交 a3d822b8 编写于 作者: M Mahati Chamarthy 提交者: Greg Kroah-Hartman

Staging: media: omap24xx: Fix else is not useful warning

This fixes the following checkpatch.pl warning:
WARNING: else is not generally useful after a break or return
Signed-off-by: NMahati Chamarthy <mahati.chamarthy@gmail.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
上级 d8e186ce
...@@ -149,8 +149,8 @@ static void omap24xxcam_dmahw_transfer_chain(void __iomem *base, int dmach, ...@@ -149,8 +149,8 @@ static void omap24xxcam_dmahw_transfer_chain(void __iomem *base, int dmach,
*/ */
omap24xxcam_dmahw_transfer_start(base, dmach); omap24xxcam_dmahw_transfer_start(base, dmach);
break; break;
} else }
ch = (ch + 1) % NUM_CAMDMA_CHANNELS; ch = (ch + 1) % NUM_CAMDMA_CHANNELS;
} }
} }
...@@ -332,15 +332,14 @@ void omap24xxcam_dma_isr(struct omap24xxcam_dma *dma) ...@@ -332,15 +332,14 @@ void omap24xxcam_dma_isr(struct omap24xxcam_dma *dma)
spin_unlock(&dma->lock); spin_unlock(&dma->lock);
omap24xxcam_dma_stop(dma, csr); omap24xxcam_dma_stop(dma, csr);
return; return;
} else { }
callback = dma->ch_state[dmach].callback; callback = dma->ch_state[dmach].callback;
arg = dma->ch_state[dmach].arg; arg = dma->ch_state[dmach].arg;
dma->free_dmach++; dma->free_dmach++;
if (callback) { if (callback) {
spin_unlock(&dma->lock); spin_unlock(&dma->lock);
(*callback) (dma, csr, arg); (*callback) (dma, csr, arg);
spin_lock(&dma->lock); spin_lock(&dma->lock);
}
} }
} }
...@@ -475,17 +474,16 @@ void omap24xxcam_sgdma_process(struct omap24xxcam_sgdma *sgdma) ...@@ -475,17 +474,16 @@ void omap24xxcam_sgdma_process(struct omap24xxcam_sgdma *sgdma)
/* DMA start failed */ /* DMA start failed */
spin_unlock_irqrestore(&sgdma->lock, flags); spin_unlock_irqrestore(&sgdma->lock, flags);
return; return;
} else {
unsigned long expires;
/* DMA start was successful */
sg_state->next_sglist++;
sg_state->bytes_read += len;
sg_state->queued_sglist++;
/* We start the reset timer */
expires = jiffies + HZ;
mod_timer(&sgdma->reset_timer, expires);
} }
unsigned long expires;
/* DMA start was successful */
sg_state->next_sglist++;
sg_state->bytes_read += len;
sg_state->queued_sglist++;
/* We start the reset timer */
expires = jiffies + HZ;
mod_timer(&sgdma->reset_timer, expires);
} }
queued_sgdma--; queued_sgdma--;
sgslot = (sgslot + 1) % NUM_SG_DMA; sgslot = (sgslot + 1) % NUM_SG_DMA;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册