[media] mtk-vcodec: fix build warnings without DEBUG

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>

diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c
index 407c8bae7c12cae951d24a726ceca1d8ff794d8a..502877a4b1df34a502145d22e57af23889643fd8 100644 (file)
--- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c
+++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c
@@ -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;
        }
 

diff --git a/drivers/media/platform/mtk-vcodec/vdec_vpu_if.c b/drivers/media/platform/mtk-vcodec/vdec_vpu_if.c
index 5a24c51aebb7dc13f2d4876bccc2bd67f1ff9203..1abd14e79565f4105b9bdbed425f6fe3d2464a30 100644 (file)
--- a/drivers/media/platform/mtk-vcodec/vdec_vpu_if.c
+++ b/drivers/media/platform/mtk-vcodec/vdec_vpu_if.c
@@ -70,9 +70,8 @@ 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;
@@ -80,7 +79,7 @@ static int vcodec_vpu_send_msg(struct vdec_vpu_inst *vpu, void *msg, int len)
        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;
        }
 

diff --git a/drivers/media/platform/mtk-vcodec/venc_vpu_if.c b/drivers/media/platform/mtk-vcodec/venc_vpu_if.c
index a01c7599b5105704eb8b6d82b98de2e977b21bd4..0d882acf88305c03371ad72595155e8411d0a04a 100644 (file)
--- a/drivers/media/platform/mtk-vcodec/venc_vpu_if.c
+++ b/drivers/media/platform/mtk-vcodec/venc_vpu_if.c
@@ -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)