diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-10-27 15:22:25 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-10-28 05:38:50 -0400 |
commit | 2869a318ce313f97f987935dd225d88a9b30b2fc (patch) | |
tree | 9d1d22243d3cca1d03cce75cd42e809b20122923 /drivers/media/platform | |
parent | 83fa235b72cf8b6075032a764e61adf11498006b (diff) |
[media] m2m-deinterlace: remove unused vars
drivers/media/platform/m2m-deinterlace.c:229:15: warning: variable 'd_size' set but not used [-Wunused-but-set-variable]
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/platform')
-rw-r--r-- | drivers/media/platform/m2m-deinterlace.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/media/platform/m2m-deinterlace.c b/drivers/media/platform/m2m-deinterlace.c index fcdbb2744ebb..05c560f2ef06 100644 --- a/drivers/media/platform/m2m-deinterlace.c +++ b/drivers/media/platform/m2m-deinterlace.c | |||
@@ -218,15 +218,14 @@ static void dma_callback(void *data) | |||
218 | static void deinterlace_issue_dma(struct deinterlace_ctx *ctx, int op, | 218 | static void deinterlace_issue_dma(struct deinterlace_ctx *ctx, int op, |
219 | int do_callback) | 219 | int do_callback) |
220 | { | 220 | { |
221 | struct deinterlace_q_data *s_q_data, *d_q_data; | 221 | struct deinterlace_q_data *s_q_data; |
222 | struct vb2_buffer *src_buf, *dst_buf; | 222 | struct vb2_buffer *src_buf, *dst_buf; |
223 | struct deinterlace_dev *pcdev = ctx->dev; | 223 | struct deinterlace_dev *pcdev = ctx->dev; |
224 | struct dma_chan *chan = pcdev->dma_chan; | 224 | struct dma_chan *chan = pcdev->dma_chan; |
225 | struct dma_device *dmadev = chan->device; | 225 | struct dma_device *dmadev = chan->device; |
226 | struct dma_async_tx_descriptor *tx; | 226 | struct dma_async_tx_descriptor *tx; |
227 | unsigned int s_width, s_height; | 227 | unsigned int s_width, s_height; |
228 | unsigned int d_width, d_height; | 228 | unsigned int s_size; |
229 | unsigned int d_size, s_size; | ||
230 | dma_addr_t p_in, p_out; | 229 | dma_addr_t p_in, p_out; |
231 | enum dma_ctrl_flags flags; | 230 | enum dma_ctrl_flags flags; |
232 | 231 | ||
@@ -238,11 +237,6 @@ static void deinterlace_issue_dma(struct deinterlace_ctx *ctx, int op, | |||
238 | s_height = s_q_data->height; | 237 | s_height = s_q_data->height; |
239 | s_size = s_width * s_height; | 238 | s_size = s_width * s_height; |
240 | 239 | ||
241 | d_q_data = get_q_data(V4L2_BUF_TYPE_VIDEO_CAPTURE); | ||
242 | d_width = d_q_data->width; | ||
243 | d_height = d_q_data->height; | ||
244 | d_size = d_width * d_height; | ||
245 | |||
246 | p_in = (dma_addr_t)vb2_dma_contig_plane_dma_addr(src_buf, 0); | 240 | p_in = (dma_addr_t)vb2_dma_contig_plane_dma_addr(src_buf, 0); |
247 | p_out = (dma_addr_t)vb2_dma_contig_plane_dma_addr(dst_buf, 0); | 241 | p_out = (dma_addr_t)vb2_dma_contig_plane_dma_addr(dst_buf, 0); |
248 | if (!p_in || !p_out) { | 242 | if (!p_in || !p_out) { |