media: rockchip vpu: remove some unused vars

As complained by gcc:

	drivers/staging/media/rockchip/vpu/rk3288_vpu_hw_jpeg_enc.c: In function 'rk3288_vpu_jpeg_enc_set_qtable':
	drivers/staging/media/rockchip/vpu/rk3288_vpu_hw_jpeg_enc.c:70:10: warning: variable 'chroma_qtable_p' set but not used [-Wunused-but-set-variable]
	  __be32 *chroma_qtable_p;
	          ^~~~~~~~~~~~~~~
	drivers/staging/media/rockchip/vpu/rk3288_vpu_hw_jpeg_enc.c:69:10: warning: variable 'luma_qtable_p' set but not used [-Wunused-but-set-variable]
	  __be32 *luma_qtable_p;
	          ^~~~~~~~~~~~~
	drivers/staging/media/rockchip/vpu/rk3399_vpu_hw_jpeg_enc.c: In function 'rk3399_vpu_jpeg_enc_set_qtable':
	drivers/staging/media/rockchip/vpu/rk3399_vpu_hw_jpeg_enc.c:101:10: warning: variable 'chroma_qtable_p' set but not used [-Wunused-but-set-variable]
	  __be32 *chroma_qtable_p;
	          ^~~~~~~~~~~~~~~
	drivers/staging/media/rockchip/vpu/rk3399_vpu_hw_jpeg_enc.c:100:10: warning: variable 'luma_qtable_p' set but not used [-Wunused-but-set-variable]
	  __be32 *luma_qtable_p;
	          ^~~~~~~~~~~~~
	drivers/staging/media/rockchip/vpu/rockchip_vpu_enc.c: In function 'rockchip_vpu_queue_setup':
	drivers/staging/media/rockchip/vpu/rockchip_vpu_enc.c:522:33: warning: variable 'vpu_fmt' set but not used [-Wunused-but-set-variable]
	  const struct rockchip_vpu_fmt *vpu_fmt;
	                                 ^~~~~~~
	drivers/staging/media/rockchip/vpu/rockchip_vpu_enc.c: In function 'rockchip_vpu_buf_prepare':
	drivers/staging/media/rockchip/vpu/rockchip_vpu_enc.c:560:33: warning: variable 'vpu_fmt' set but not used [-Wunused-but-set-variable]
	  const struct rockchip_vpu_fmt *vpu_fmt;
	                                 ^~~~~~~

Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Acked-by: Ezequiel Garcia <ezequiel@collabora.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

diff --git a/drivers/staging/media/rockchip/vpu/rk3288_vpu_hw_jpeg_enc.c b/drivers/staging/media/rockchip/vpu/rk3288_vpu_hw_jpeg_enc.c
index e27c10855de5eb46717cc14cd41f6dc9d4ff2d3a..5282236d1bb190e7ecd9e798a08e7d198d3074ff 100644 (file)
--- a/drivers/staging/media/rockchip/vpu/rk3288_vpu_hw_jpeg_enc.c
+++ b/drivers/staging/media/rockchip/vpu/rk3288_vpu_hw_jpeg_enc.c
@@ -66,13 +66,8 @@ rk3288_vpu_jpeg_enc_set_qtable(struct rockchip_vpu_dev *vpu,
                               unsigned char *luma_qtable,
                               unsigned char *chroma_qtable)
 {
-       __be32 *luma_qtable_p;
-       __be32 *chroma_qtable_p;
        u32 reg, i;
 
-       luma_qtable_p = (__be32 *)luma_qtable;
-       chroma_qtable_p = (__be32 *)chroma_qtable;
-
        for (i = 0; i < VEPU_JPEG_QUANT_TABLE_COUNT; i++) {
                reg = get_unaligned_be32(&luma_qtable[i]);
                vepu_write_relaxed(vpu, reg, VEPU_REG_JPEG_LUMA_QUAT(i));

diff --git a/drivers/staging/media/rockchip/vpu/rk3399_vpu_hw_jpeg_enc.c b/drivers/staging/media/rockchip/vpu/rk3399_vpu_hw_jpeg_enc.c
index 5f75e4d11d76b3d63203dfdf21d889a4ce870c94..dbc86d95fe3ba298af83585727e5e403205fe6c8 100644 (file)
--- a/drivers/staging/media/rockchip/vpu/rk3399_vpu_hw_jpeg_enc.c
+++ b/drivers/staging/media/rockchip/vpu/rk3399_vpu_hw_jpeg_enc.c
@@ -97,13 +97,8 @@ rk3399_vpu_jpeg_enc_set_qtable(struct rockchip_vpu_dev *vpu,
                               unsigned char *luma_qtable,
                               unsigned char *chroma_qtable)
 {
-       __be32 *luma_qtable_p;
-       __be32 *chroma_qtable_p;
        u32 reg, i;
 
-       luma_qtable_p = (__be32 *)luma_qtable;
-       chroma_qtable_p = (__be32 *)chroma_qtable;
-
        for (i = 0; i < VEPU_JPEG_QUANT_TABLE_COUNT; i++) {
                reg = get_unaligned_be32(&luma_qtable[i]);
                vepu_write_relaxed(vpu, reg, VEPU_REG_JPEG_LUMA_QUAT(i));

diff --git a/drivers/staging/media/rockchip/vpu/rockchip_vpu_enc.c b/drivers/staging/media/rockchip/vpu/rockchip_vpu_enc.c
index 038a7136d5d1fd34160ccb679a45cb49db45ff2f..ab0fb2053620b325292489d31649a153f561044b 100644 (file)
--- a/drivers/staging/media/rockchip/vpu/rockchip_vpu_enc.c
+++ b/drivers/staging/media/rockchip/vpu/rockchip_vpu_enc.c
@@ -519,17 +519,14 @@ rockchip_vpu_queue_setup(struct vb2_queue *vq,
                         struct device *alloc_devs[])
 {
        struct rockchip_vpu_ctx *ctx = vb2_get_drv_priv(vq);
-       const struct rockchip_vpu_fmt *vpu_fmt;
        struct v4l2_pix_format_mplane *pixfmt;
        int i;
 
        switch (vq->type) {
        case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE:
-               vpu_fmt = ctx->vpu_dst_fmt;
                pixfmt = &ctx->dst_fmt;
                break;
        case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE:
-               vpu_fmt = ctx->vpu_src_fmt;
                pixfmt = &ctx->src_fmt;
                break;
        default:
@@ -557,7 +554,6 @@ static int rockchip_vpu_buf_prepare(struct vb2_buffer *vb)
        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct vb2_queue *vq = vb->vb2_queue;
        struct rockchip_vpu_ctx *ctx = vb2_get_drv_priv(vq);
-       const struct rockchip_vpu_fmt *vpu_fmt;
        struct v4l2_pix_format_mplane *pixfmt;
        unsigned int sz;
        int ret = 0;
@@ -565,11 +561,9 @@ static int rockchip_vpu_buf_prepare(struct vb2_buffer *vb)
 
        switch (vq->type) {
        case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE:
-               vpu_fmt = ctx->vpu_dst_fmt;
                pixfmt = &ctx->dst_fmt;
                break;
        case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE:
-               vpu_fmt = ctx->vpu_src_fmt;
                pixfmt = &ctx->src_fmt;
 
                if (vbuf->field == V4L2_FIELD_ANY)