aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@osg.samsung.com>2014-09-24 17:32:54 -0400
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2014-09-26 05:47:59 -0400
commite13f7d5aec0694bf2cb6f53a732f6a444933fdf4 (patch)
tree5e9f00d0185bae49f731821d5c45fca96f3d68ad
parent0db3241458685b22b6cd4db363722e6932244601 (diff)
[media] s5p_mfc_opr_v5: Fix lots of warnings on x86_64
When compiled on x86_64, several warnings popup: drivers/media//platform/s5p-mfc/s5p_mfc_opr_v5.c:476:3: warning: format ‘%x’ expects argument of type ‘unsigned int’, but argument 5 has type ‘size_t’ [-Wformat=] drivers/media//platform/s5p-mfc/s5p_mfc_opr_v5.c:480:3: warning: format ‘%x’ expects argument of type ‘unsigned int’, but argument 5 has type ‘size_t’ [-Wformat=] drivers/media//platform/s5p-mfc/s5p_mfc_opr_v5.c:485:4: warning: format ‘%x’ expects argument of type ‘unsigned int’, but argument 4 has type ‘size_t’ [-Wformat=] drivers/media//platform/s5p-mfc/s5p_mfc_opr_v5.c:493:2: warning: format ‘%u’ expects argument of type ‘unsigned int’, but argument 4 has type ‘size_t’ [-Wformat=] drivers/media//platform/s5p-mfc/s5p_mfc_opr_v5.c:570:2: warning: format ‘%d’ expects argument of type ‘int’, but argument 4 has type ‘size_t’ [-Wformat=] drivers/media//platform/s5p-mfc/s5p_mfc_opr_v5.c:570:2: warning: format ‘%d’ expects argument of type ‘int’, but argument 5 has type ‘size_t’ [-Wformat=] drivers/media//platform/s5p-mfc/s5p_mfc_opr_v5.c:609:3: warning: format ‘%d’ expects argument of type ‘int’, but argument 4 has type ‘size_t’ [-Wformat=] drivers/media//platform/s5p-mfc/s5p_mfc_opr_v5.c:609:3: warning: format ‘%d’ expects argument of type ‘int’, but argument 5 has type ‘size_t’ [-Wformat=] drivers/media//platform/s5p-mfc/s5p_mfc_opr_v5.c:640:3: warning: format ‘%d’ expects argument of type ‘int’, but argument 4 has type ‘size_t’ [-Wformat=] drivers/media//platform/s5p-mfc/s5p_mfc_opr_v5.c:640:3: warning: format ‘%d’ expects argument of type ‘int’, but argument 5 has type ‘size_t’ [-Wformat=] drivers/media//platform/s5p-mfc/s5p_mfc_opr_v5.c:666:3: warning: format ‘%d’ expects argument of type ‘int’, but argument 4 has type ‘size_t’ [-Wformat=] drivers/media//platform/s5p-mfc/s5p_mfc_opr_v5.c:666:3: warning: format ‘%d’ expects argument of type ‘int’, but argument 5 has type ‘size_t’ [-Wformat=] Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
-rw-r--r--drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c
index 6234e4d70596..90e3d61c1b59 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c
@@ -473,16 +473,16 @@ static int s5p_mfc_set_dec_frame_buffer_v5(struct s5p_mfc_ctx *ctx)
473 frame_size_mv); 473 frame_size_mv);
474 for (i = 0; i < ctx->total_dpb_count; i++) { 474 for (i = 0; i < ctx->total_dpb_count; i++) {
475 /* Bank2 */ 475 /* Bank2 */
476 mfc_debug(2, "Luma %d: %x\n", i, 476 mfc_debug(2, "Luma %d: %zx\n", i,
477 ctx->dst_bufs[i].cookie.raw.luma); 477 ctx->dst_bufs[i].cookie.raw.luma);
478 mfc_write(dev, OFFSETB(ctx->dst_bufs[i].cookie.raw.luma), 478 mfc_write(dev, OFFSETB(ctx->dst_bufs[i].cookie.raw.luma),
479 S5P_FIMV_DEC_LUMA_ADR + i * 4); 479 S5P_FIMV_DEC_LUMA_ADR + i * 4);
480 mfc_debug(2, "\tChroma %d: %x\n", i, 480 mfc_debug(2, "\tChroma %d: %zx\n", i,
481 ctx->dst_bufs[i].cookie.raw.chroma); 481 ctx->dst_bufs[i].cookie.raw.chroma);
482 mfc_write(dev, OFFSETA(ctx->dst_bufs[i].cookie.raw.chroma), 482 mfc_write(dev, OFFSETA(ctx->dst_bufs[i].cookie.raw.chroma),
483 S5P_FIMV_DEC_CHROMA_ADR + i * 4); 483 S5P_FIMV_DEC_CHROMA_ADR + i * 4);
484 if (ctx->codec_mode == S5P_MFC_CODEC_H264_DEC) { 484 if (ctx->codec_mode == S5P_MFC_CODEC_H264_DEC) {
485 mfc_debug(2, "\tBuf2: %x, size: %d\n", 485 mfc_debug(2, "\tBuf2: %zx, size: %d\n",
486 buf_addr2, buf_size2); 486 buf_addr2, buf_size2);
487 mfc_write(dev, OFFSETB(buf_addr2), 487 mfc_write(dev, OFFSETB(buf_addr2),
488 S5P_FIMV_H264_MV_ADR + i * 4); 488 S5P_FIMV_H264_MV_ADR + i * 4);
@@ -490,7 +490,7 @@ static int s5p_mfc_set_dec_frame_buffer_v5(struct s5p_mfc_ctx *ctx)
490 buf_size2 -= frame_size_mv; 490 buf_size2 -= frame_size_mv;
491 } 491 }
492 } 492 }
493 mfc_debug(2, "Buf1: %u, buf_size1: %d\n", buf_addr1, buf_size1); 493 mfc_debug(2, "Buf1: %zu, buf_size1: %d\n", buf_addr1, buf_size1);
494 mfc_debug(2, "Buf 1/2 size after: %d/%d (frames %d)\n", 494 mfc_debug(2, "Buf 1/2 size after: %d/%d (frames %d)\n",
495 buf_size1, buf_size2, ctx->total_dpb_count); 495 buf_size1, buf_size2, ctx->total_dpb_count);
496 if (buf_size1 < 0 || buf_size2 < 0) { 496 if (buf_size1 < 0 || buf_size2 < 0) {
@@ -567,7 +567,7 @@ static int s5p_mfc_set_enc_ref_buffer_v5(struct s5p_mfc_ctx *ctx)
567 enc_ref_c_size = ALIGN(guard_width * guard_height, 567 enc_ref_c_size = ALIGN(guard_width * guard_height,
568 S5P_FIMV_NV12MT_SALIGN); 568 S5P_FIMV_NV12MT_SALIGN);
569 } 569 }
570 mfc_debug(2, "buf_size1: %d, buf_size2: %d\n", buf_size1, buf_size2); 570 mfc_debug(2, "buf_size1: %zd, buf_size2: %zd\n", buf_size1, buf_size2);
571 switch (ctx->codec_mode) { 571 switch (ctx->codec_mode) {
572 case S5P_MFC_CODEC_H264_ENC: 572 case S5P_MFC_CODEC_H264_ENC:
573 for (i = 0; i < 2; i++) { 573 for (i = 0; i < 2; i++) {
@@ -606,7 +606,7 @@ static int s5p_mfc_set_enc_ref_buffer_v5(struct s5p_mfc_ctx *ctx)
606 S5P_FIMV_H264_NBOR_INFO_ADR); 606 S5P_FIMV_H264_NBOR_INFO_ADR);
607 buf_addr1 += S5P_FIMV_ENC_NBORINFO_SIZE; 607 buf_addr1 += S5P_FIMV_ENC_NBORINFO_SIZE;
608 buf_size1 -= S5P_FIMV_ENC_NBORINFO_SIZE; 608 buf_size1 -= S5P_FIMV_ENC_NBORINFO_SIZE;
609 mfc_debug(2, "buf_size1: %d, buf_size2: %d\n", 609 mfc_debug(2, "buf_size1: %zd, buf_size2: %zd\n",
610 buf_size1, buf_size2); 610 buf_size1, buf_size2);
611 break; 611 break;
612 case S5P_MFC_CODEC_MPEG4_ENC: 612 case S5P_MFC_CODEC_MPEG4_ENC:
@@ -637,7 +637,7 @@ static int s5p_mfc_set_enc_ref_buffer_v5(struct s5p_mfc_ctx *ctx)
637 S5P_FIMV_MPEG4_ACDC_COEF_ADR); 637 S5P_FIMV_MPEG4_ACDC_COEF_ADR);
638 buf_addr1 += S5P_FIMV_ENC_ACDCCOEF_SIZE; 638 buf_addr1 += S5P_FIMV_ENC_ACDCCOEF_SIZE;
639 buf_size1 -= S5P_FIMV_ENC_ACDCCOEF_SIZE; 639 buf_size1 -= S5P_FIMV_ENC_ACDCCOEF_SIZE;
640 mfc_debug(2, "buf_size1: %d, buf_size2: %d\n", 640 mfc_debug(2, "buf_size1: %zd, buf_size2: %zd\n",
641 buf_size1, buf_size2); 641 buf_size1, buf_size2);
642 break; 642 break;
643 case S5P_MFC_CODEC_H263_ENC: 643 case S5P_MFC_CODEC_H263_ENC:
@@ -663,7 +663,7 @@ static int s5p_mfc_set_enc_ref_buffer_v5(struct s5p_mfc_ctx *ctx)
663 mfc_write(dev, OFFSETA(buf_addr1), S5P_FIMV_H263_ACDC_COEF_ADR); 663 mfc_write(dev, OFFSETA(buf_addr1), S5P_FIMV_H263_ACDC_COEF_ADR);
664 buf_addr1 += S5P_FIMV_ENC_ACDCCOEF_SIZE; 664 buf_addr1 += S5P_FIMV_ENC_ACDCCOEF_SIZE;
665 buf_size1 -= S5P_FIMV_ENC_ACDCCOEF_SIZE; 665 buf_size1 -= S5P_FIMV_ENC_ACDCCOEF_SIZE;
666 mfc_debug(2, "buf_size1: %d, buf_size2: %d\n", 666 mfc_debug(2, "buf_size1: %zd, buf_size2: %zd\n",
667 buf_size1, buf_size2); 667 buf_size1, buf_size2);
668 break; 668 break;
669 default: 669 default: