aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/platform/s5p-mfc
diff options
context:
space:
mode:
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>2012-12-02 06:17:08 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-01-06 06:53:34 -0500
commit20fe1cf081ae861e66611b3a8f289fabd8d56a8f (patch)
treef5a6f25b2f7fc377367b9e22dbc07e4bb23d5236 /drivers/media/platform/s5p-mfc
parentb27a23be0d1de44ab2cc01495b4f9149f4f762d5 (diff)
[media] s5p-mfc: remove unused variable
The variable index is initialized but never used otherwise, so remove the unused variable. Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/platform/s5p-mfc')
-rw-r--r--drivers/media/platform/s5p-mfc/s5p_mfc.c5
-rw-r--r--drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c6
2 files changed, 0 insertions, 11 deletions
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c b/drivers/media/platform/s5p-mfc/s5p_mfc.c
index e2fe64efb756..a49d0e5db93a 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c
@@ -274,7 +274,6 @@ static void s5p_mfc_handle_frame_new(struct s5p_mfc_ctx *ctx, unsigned int err)
274 struct s5p_mfc_buf *dst_buf; 274 struct s5p_mfc_buf *dst_buf;
275 size_t dspl_y_addr; 275 size_t dspl_y_addr;
276 unsigned int frame_type; 276 unsigned int frame_type;
277 unsigned int index;
278 277
279 dspl_y_addr = s5p_mfc_hw_call(dev->mfc_ops, get_dspl_y_adr, dev); 278 dspl_y_addr = s5p_mfc_hw_call(dev->mfc_ops, get_dspl_y_adr, dev);
280 frame_type = s5p_mfc_hw_call(dev->mfc_ops, get_dec_frame_type, dev); 279 frame_type = s5p_mfc_hw_call(dev->mfc_ops, get_dec_frame_type, dev);
@@ -311,7 +310,6 @@ static void s5p_mfc_handle_frame_new(struct s5p_mfc_ctx *ctx, unsigned int err)
311 vb2_buffer_done(dst_buf->b, 310 vb2_buffer_done(dst_buf->b,
312 err ? VB2_BUF_STATE_ERROR : VB2_BUF_STATE_DONE); 311 err ? VB2_BUF_STATE_ERROR : VB2_BUF_STATE_DONE);
313 312
314 index = dst_buf->b->v4l2_buf.index;
315 break; 313 break;
316 } 314 }
317 } 315 }
@@ -327,8 +325,6 @@ static void s5p_mfc_handle_frame(struct s5p_mfc_ctx *ctx,
327 unsigned long flags; 325 unsigned long flags;
328 unsigned int res_change; 326 unsigned int res_change;
329 327
330 unsigned int index;
331
332 dst_frame_status = s5p_mfc_hw_call(dev->mfc_ops, get_dspl_status, dev) 328 dst_frame_status = s5p_mfc_hw_call(dev->mfc_ops, get_dspl_status, dev)
333 & S5P_FIMV_DEC_STATUS_DECODING_STATUS_MASK; 329 & S5P_FIMV_DEC_STATUS_DECODING_STATUS_MASK;
334 res_change = (s5p_mfc_hw_call(dev->mfc_ops, get_dspl_status, dev) 330 res_change = (s5p_mfc_hw_call(dev->mfc_ops, get_dspl_status, dev)
@@ -388,7 +384,6 @@ static void s5p_mfc_handle_frame(struct s5p_mfc_ctx *ctx,
388 mfc_debug(2, "Running again the same buffer\n"); 384 mfc_debug(2, "Running again the same buffer\n");
389 ctx->after_packed_pb = 1; 385 ctx->after_packed_pb = 1;
390 } else { 386 } else {
391 index = src_buf->b->v4l2_buf.index;
392 mfc_debug(2, "MFC needs next buffer\n"); 387 mfc_debug(2, "MFC needs next buffer\n");
393 ctx->consumed_stream = 0; 388 ctx->consumed_stream = 0;
394 list_del(&src_buf->list); 389 list_del(&src_buf->list);
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c
index 3a8cfd9fc1bd..bf4d2f44f009 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c
@@ -1408,7 +1408,6 @@ static inline int s5p_mfc_run_dec_frame(struct s5p_mfc_ctx *ctx)
1408 struct s5p_mfc_buf *temp_vb; 1408 struct s5p_mfc_buf *temp_vb;
1409 unsigned long flags; 1409 unsigned long flags;
1410 int last_frame = 0; 1410 int last_frame = 0;
1411 unsigned int index;
1412 1411
1413 spin_lock_irqsave(&dev->irqlock, flags); 1412 spin_lock_irqsave(&dev->irqlock, flags);
1414 1413
@@ -1427,8 +1426,6 @@ static inline int s5p_mfc_run_dec_frame(struct s5p_mfc_ctx *ctx)
1427 temp_vb->b->v4l2_planes[0].bytesused); 1426 temp_vb->b->v4l2_planes[0].bytesused);
1428 spin_unlock_irqrestore(&dev->irqlock, flags); 1427 spin_unlock_irqrestore(&dev->irqlock, flags);
1429 1428
1430 index = temp_vb->b->v4l2_buf.index;
1431
1432 dev->curr_ctx = ctx->num; 1429 dev->curr_ctx = ctx->num;
1433 s5p_mfc_clean_ctx_int_flags(ctx); 1430 s5p_mfc_clean_ctx_int_flags(ctx);
1434 if (temp_vb->b->v4l2_planes[0].bytesused == 0) { 1431 if (temp_vb->b->v4l2_planes[0].bytesused == 0) {
@@ -1452,7 +1449,6 @@ static inline int s5p_mfc_run_enc_frame(struct s5p_mfc_ctx *ctx)
1452 unsigned int src_y_size, src_c_size; 1449 unsigned int src_y_size, src_c_size;
1453 */ 1450 */
1454 unsigned int dst_size; 1451 unsigned int dst_size;
1455 unsigned int index;
1456 1452
1457 spin_lock_irqsave(&dev->irqlock, flags); 1453 spin_lock_irqsave(&dev->irqlock, flags);
1458 1454
@@ -1487,8 +1483,6 @@ static inline int s5p_mfc_run_enc_frame(struct s5p_mfc_ctx *ctx)
1487 1483
1488 spin_unlock_irqrestore(&dev->irqlock, flags); 1484 spin_unlock_irqrestore(&dev->irqlock, flags);
1489 1485
1490 index = src_mb->b->v4l2_buf.index;
1491
1492 dev->curr_ctx = ctx->num; 1486 dev->curr_ctx = ctx->num;
1493 s5p_mfc_clean_ctx_int_flags(ctx); 1487 s5p_mfc_clean_ctx_int_flags(ctx);
1494 s5p_mfc_encode_one_frame_v6(ctx); 1488 s5p_mfc_encode_one_frame_v6(ctx);