From a3d822b8e3df89a116ce86df6200da9004438518 Mon Sep 17 00:00:00 2001 From: Mahati Chamarthy Date: Tue, 23 Sep 2014 22:09:23 +0530 Subject: [PATCH] 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: Mahati Chamarthy Signed-off-by: Greg Kroah-Hartman --- drivers/staging/media/omap24xx/omap24xxcam-dma.c | 40 +++++++++++------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/drivers/staging/media/omap24xx/omap24xxcam-dma.c b/drivers/staging/media/omap24xx/omap24xxcam-dma.c index 9c00776..afb9e08 100644 --- a/drivers/staging/media/omap24xx/omap24xxcam-dma.c +++ b/drivers/staging/media/omap24xx/omap24xxcam-dma.c @@ -149,8 +149,8 @@ static void omap24xxcam_dmahw_transfer_chain(void __iomem *base, int dmach, */ omap24xxcam_dmahw_transfer_start(base, dmach); 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) spin_unlock(&dma->lock); omap24xxcam_dma_stop(dma, csr); return; - } else { - callback = dma->ch_state[dmach].callback; - arg = dma->ch_state[dmach].arg; - dma->free_dmach++; - if (callback) { - spin_unlock(&dma->lock); - (*callback) (dma, csr, arg); - spin_lock(&dma->lock); - } + } + callback = dma->ch_state[dmach].callback; + arg = dma->ch_state[dmach].arg; + dma->free_dmach++; + if (callback) { + spin_unlock(&dma->lock); + (*callback) (dma, csr, arg); + spin_lock(&dma->lock); } } @@ -475,17 +474,16 @@ void omap24xxcam_sgdma_process(struct omap24xxcam_sgdma *sgdma) /* DMA start failed */ spin_unlock_irqrestore(&sgdma->lock, flags); 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--; sgslot = (sgslot + 1) % NUM_SG_DMA; -- 2.7.4