From: Mahati Chamarthy Date: Tue, 30 Sep 2014 15:06:06 +0000 (+0530) Subject: Staging: media: omap24xx: Merge two lines and remove unused variable X-Git-Tag: v5.15~17125^2~104 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=50b47bbd43510d754e86f0f590488d67f39f4374;p=platform%2Fkernel%2Flinux-starfive.git Staging: media: omap24xx: Merge two lines and remove unused variable This patch merges two lines and removes a variable that becomes unused after merging. Signed-off-by: Mahati Chamarthy Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/media/omap24xx/omap24xxcam-dma.c b/drivers/staging/media/omap24xx/omap24xxcam-dma.c index fa0c156..c427eb9 100644 --- a/drivers/staging/media/omap24xx/omap24xxcam-dma.c +++ b/drivers/staging/media/omap24xx/omap24xxcam-dma.c @@ -475,15 +475,13 @@ void omap24xxcam_sgdma_process(struct omap24xxcam_sgdma *sgdma) spin_unlock_irqrestore(&sgdma->lock, flags); return; } - 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); + mod_timer(&sgdma->reset_timer, jiffies + HZ); } queued_sgdma--; sgslot = (sgslot + 1) % NUM_SG_DMA;