Skip to content

Commit

Permalink
[media] mtk-vcodec: fix build warnings without DEBUG
Browse files Browse the repository at this point in the history
After removing DEBUG from mtk_vcodec_util.h, some build warnings are
generated as the following:
.../drivers/media/platform/mtk-vcodec/vdec_vpu_if.c: In function 'vcodec_vpu_send_msg':
.../drivers/media/platform/mtk-vcodec/vdec_vpu_if.c:73:11: warning: unused variable 'msg_id' [-Wunused-variable]
  uint32_t msg_id = *(uint32_t *)msg;
           ^
.../drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c: In function 'vb2ops_vdec_buf_queue':
.../drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c:1129:7: warning: unused variable 'log_level' [-Wunused-variable]
   int log_level = ret ? 0 : 1;
       ^
.../drivers/media/platform/mtk-vcodec/venc_vpu_if.c: In function 'vpu_enc_send_msg':
.../drivers/media/platform/mtk-vcodec/venc_vpu_if.c:82:12: warning: unused variable 'msg_id' [-Wunused-variable]
   uint32_t msg_id = *(uint32_t *)msg;
            ^

It is because mtk_vcodec_debug() and mtk_vcodec_err() are defined as empty
macros. Without DEBUG definition, the variable for debugging is not used
anymore. Fixing build warnings by moving the assignment of the
variable to the argument of mtk_vcodec_debug() and mtk_vcodec_err().
Within the patch, build pass with/without DEBUG definition, and functions
still work fine.

Signed-off-by: Minghsiu Tsai <minghsiu.tsai@mediatek.com>
Reviewed-by: Daniel Kurtz <djkurtz@chromium.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
  • Loading branch information
Minghsiu Tsai authored and Mauro Carvalho Chehab committed Feb 8, 2017
1 parent 0d1270d commit 9eeb0ed
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 11 deletions.
9 changes: 4 additions & 5 deletions drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c
Original file line number Diff line number Diff line change
Expand Up @@ -1168,15 +1168,14 @@ static void vb2ops_vdec_buf_queue(struct vb2_buffer *vb)
* if there is no SPS header or picture info
* in bs
*/
int log_level = ret ? 0 : 1;

src_buf = v4l2_m2m_src_buf_remove(ctx->m2m_ctx);
v4l2_m2m_buf_done(to_vb2_v4l2_buffer(src_buf),
VB2_BUF_STATE_DONE);
mtk_v4l2_debug(log_level,
"[%d] vdec_if_decode() src_buf=%d, size=%zu, fail=%d, res_chg=%d",
ctx->id, src_buf->index,
src_mem.size, ret, res_chg);
mtk_v4l2_debug(ret ? 0 : 1,
"[%d] vdec_if_decode() src_buf=%d, size=%zu, fail=%d, res_chg=%d",
ctx->id, src_buf->index,
src_mem.size, ret, res_chg);
return;
}

Expand Down
5 changes: 2 additions & 3 deletions drivers/media/platform/mtk-vcodec/vdec_vpu_if.c
Original file line number Diff line number Diff line change
Expand Up @@ -70,17 +70,16 @@ void vpu_dec_ipi_handler(void *data, unsigned int len, void *priv)
static int vcodec_vpu_send_msg(struct vdec_vpu_inst *vpu, void *msg, int len)
{
int err;
uint32_t msg_id = *(uint32_t *)msg;

mtk_vcodec_debug(vpu, "id=%X", msg_id);
mtk_vcodec_debug(vpu, "id=%X", *(uint32_t *)msg);

vpu->failure = 0;
vpu->signaled = 0;

err = vpu_ipi_send(vpu->dev, vpu->id, msg, len);
if (err) {
mtk_vcodec_err(vpu, "send fail vpu_id=%d msg_id=%X status=%d",
vpu->id, msg_id, err);
vpu->id, *(uint32_t *)msg, err);
return err;
}

Expand Down
4 changes: 1 addition & 3 deletions drivers/media/platform/mtk-vcodec/venc_vpu_if.c
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,8 @@ static int vpu_enc_send_msg(struct venc_vpu_inst *vpu, void *msg,

status = vpu_ipi_send(vpu->dev, vpu->id, msg, len);
if (status) {
uint32_t msg_id = *(uint32_t *)msg;

mtk_vcodec_err(vpu, "vpu_ipi_send msg_id %x len %d fail %d",
msg_id, len, status);
*(uint32_t *)msg, len, status);
return -EINVAL;
}
if (vpu->failure)
Expand Down

0 comments on commit 9eeb0ed

Please sign in to comment.