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 <mahati.chamarthy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/media/omap24xx/omap24xxcam-dma.c b/drivers/staging/media/omap24xx/omap24xxcam-dma.c
index fa0c15637db11e26cc82b0278974b18c5c0a78ec..c427eb94ea66efcff37874b1f11564e11fbfd1c9 100644 (file)
--- 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;