aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <m.chehab@samsung.com>2014-08-26 10:13:47 -0400
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-08-26 17:52:13 -0400
commit8492ec69801ea039546fd27e84fa84f7a0612474 (patch)
tree50cfa337fbff08f87c1f0114aaf02feb1ae56fea /drivers/media/platform/s5p-mfc/s5p_mfc_enc.c
parentb171e3d8514e80c8e01e59565010b1d7879ac019 (diff)
[media] s5p_mfc: get rid of several warnings
drivers/media/platform/s5p-mfc/s5p_mfc_dec.c:826:5: warning: no previous prototype for 'vidioc_decoder_cmd' [-Wmissing-prototypes] int vidioc_decoder_cmd(struct file *file, void *priv, ^ drivers/media/platform/s5p-mfc/s5p_mfc.c: In function 's5p_mfc_runtime_resume': drivers/media/platform/s5p-mfc/s5p_mfc.c:1314:6: warning: variable 'pre_power' set but not used [-Wunused-but-set-variable] int pre_power; ^ drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.c:163:25: warning: no previous prototype for 's5p_mfc_init_hw_cmds_v5' [-Wmissing-prototypes] struct s5p_mfc_hw_cmds *s5p_mfc_init_hw_cmds_v5(void) ^ drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.c:156:25: warning: no previous prototype for 's5p_mfc_init_hw_cmds_v6' [-Wmissing-prototypes] struct s5p_mfc_hw_cmds *s5p_mfc_init_hw_cmds_v6(void) ^ drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c: In function 's5p_mfc_run_dec_frame': drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c:1189:15: warning: variable 'index' set but not used [-Wunused-but-set-variable] unsigned int index; ^ drivers/media/platform/s5p-mfc/s5p_mfc_enc.c: In function 'cleanup_ref_queue': drivers/media/platform/s5p-mfc/s5p_mfc_enc.c:742:27: warning: variable 'mb_c_addr' set but not used [-Wunused-but-set-variable] unsigned long mb_y_addr, mb_c_addr; ^ drivers/media/platform/s5p-mfc/s5p_mfc_enc.c:742:16: warning: variable 'mb_y_addr' set but not used [-Wunused-but-set-variable] unsigned long mb_y_addr, mb_c_addr; ^ drivers/media/platform/s5p-mfc/s5p_mfc_enc.c: At top level: drivers/media/platform/s5p-mfc/s5p_mfc_enc.c:1684:5: warning: no previous prototype for 'vidioc_encoder_cmd' [-Wmissing-prototypes] int vidioc_encoder_cmd(struct file *file, void *priv, ^ Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/platform/s5p-mfc/s5p_mfc_enc.c')
-rw-r--r--drivers/media/platform/s5p-mfc/s5p_mfc_enc.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c b/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c
index d26b2484ca10..41f3b7f512fa 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c
@@ -739,14 +739,11 @@ static int s5p_mfc_ctx_ready(struct s5p_mfc_ctx *ctx)
739static void cleanup_ref_queue(struct s5p_mfc_ctx *ctx) 739static void cleanup_ref_queue(struct s5p_mfc_ctx *ctx)
740{ 740{
741 struct s5p_mfc_buf *mb_entry; 741 struct s5p_mfc_buf *mb_entry;
742 unsigned long mb_y_addr, mb_c_addr;
743 742
744 /* move buffers in ref queue to src queue */ 743 /* move buffers in ref queue to src queue */
745 while (!list_empty(&ctx->ref_queue)) { 744 while (!list_empty(&ctx->ref_queue)) {
746 mb_entry = list_entry((&ctx->ref_queue)->next, 745 mb_entry = list_entry((&ctx->ref_queue)->next,
747 struct s5p_mfc_buf, list); 746 struct s5p_mfc_buf, list);
748 mb_y_addr = vb2_dma_contig_plane_dma_addr(mb_entry->b, 0);
749 mb_c_addr = vb2_dma_contig_plane_dma_addr(mb_entry->b, 1);
750 list_del(&mb_entry->list); 747 list_del(&mb_entry->list);
751 ctx->ref_queue_cnt--; 748 ctx->ref_queue_cnt--;
752 list_add_tail(&mb_entry->list, &ctx->src_queue); 749 list_add_tail(&mb_entry->list, &ctx->src_queue);
@@ -1681,8 +1678,8 @@ static int vidioc_g_parm(struct file *file, void *priv,
1681 return 0; 1678 return 0;
1682} 1679}
1683 1680
1684int vidioc_encoder_cmd(struct file *file, void *priv, 1681static int vidioc_encoder_cmd(struct file *file, void *priv,
1685 struct v4l2_encoder_cmd *cmd) 1682 struct v4l2_encoder_cmd *cmd)
1686{ 1683{
1687 struct s5p_mfc_ctx *ctx = fh_to_ctx(priv); 1684 struct s5p_mfc_ctx *ctx = fh_to_ctx(priv);
1688 struct s5p_mfc_dev *dev = ctx->dev; 1685 struct s5p_mfc_dev *dev = ctx->dev;