[media] s5p-mfc: remove unused variable (20fe1cf0) · Commits · 戴 / test

drivers/media/platform/s5p-mfc/s5p_mfc.c

+0 −5

Original line number	Diff line number	Diff line
		@@ -274,7 +274,6 @@ static void s5p_mfc_handle_frame_new(struct s5p_mfc_ctx *ctx, unsigned int err)
		struct s5p_mfc_buf *dst_buf;
		size_t dspl_y_addr;
		unsigned int frame_type;
		unsigned int index;

		dspl_y_addr = s5p_mfc_hw_call(dev->mfc_ops, get_dspl_y_adr, dev);
		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)
		vb2_buffer_done(dst_buf->b,
		err ? VB2_BUF_STATE_ERROR : VB2_BUF_STATE_DONE);

		index = dst_buf->b->v4l2_buf.index;
		break;
		}
		}
		@@ -327,8 +325,6 @@ static void s5p_mfc_handle_frame(struct s5p_mfc_ctx *ctx,
		unsigned long flags;
		unsigned int res_change;

		unsigned int index;

		dst_frame_status = s5p_mfc_hw_call(dev->mfc_ops, get_dspl_status, dev)
		& S5P_FIMV_DEC_STATUS_DECODING_STATUS_MASK;
		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,
		mfc_debug(2, "Running again the same buffer\n");
		ctx->after_packed_pb = 1;
		} else {
		index = src_buf->b->v4l2_buf.index;
		mfc_debug(2, "MFC needs next buffer\n");
		ctx->consumed_stream = 0;
		list_del(&src_buf->list);

+0 −6

Original line number	Diff line number	Diff line
		@@ -1408,7 +1408,6 @@ static inline int s5p_mfc_run_dec_frame(struct s5p_mfc_ctx *ctx)
		struct s5p_mfc_buf *temp_vb;
		unsigned long flags;
		int last_frame = 0;
		unsigned int index;

		spin_lock_irqsave(&dev->irqlock, flags);

		@@ -1427,8 +1426,6 @@ static inline int s5p_mfc_run_dec_frame(struct s5p_mfc_ctx *ctx)
		temp_vb->b->v4l2_planes[0].bytesused);
		spin_unlock_irqrestore(&dev->irqlock, flags);

		index = temp_vb->b->v4l2_buf.index;

		dev->curr_ctx = ctx->num;
		s5p_mfc_clean_ctx_int_flags(ctx);
		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)
		unsigned int src_y_size, src_c_size;
		*/
		unsigned int dst_size;
		unsigned int index;

		spin_lock_irqsave(&dev->irqlock, flags);

		@@ -1487,8 +1483,6 @@ static inline int s5p_mfc_run_enc_frame(struct s5p_mfc_ctx *ctx)

		spin_unlock_irqrestore(&dev->irqlock, flags);

		index = src_mb->b->v4l2_buf.index;

		dev->curr_ctx = ctx->num;
		s5p_mfc_clean_ctx_int_flags(ctx);
		s5p_mfc_encode_one_frame_v6(ctx);