aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c
index ed3d20f12184..e38d78f21726 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c
@@ -2019,25 +2019,25 @@ static int s5p_mfc_get_mvc_view_id_v6(struct s5p_mfc_dev *dev)
2019static unsigned int s5p_mfc_get_pic_type_top_v6(struct s5p_mfc_ctx *ctx) 2019static unsigned int s5p_mfc_get_pic_type_top_v6(struct s5p_mfc_ctx *ctx)
2020{ 2020{
2021 return s5p_mfc_read_info_v6(ctx, 2021 return s5p_mfc_read_info_v6(ctx,
2022 (unsigned int) ctx->dev->mfc_regs->d_ret_picture_tag_top); 2022 (__force unsigned int) ctx->dev->mfc_regs->d_ret_picture_tag_top);
2023} 2023}
2024 2024
2025static unsigned int s5p_mfc_get_pic_type_bot_v6(struct s5p_mfc_ctx *ctx) 2025static unsigned int s5p_mfc_get_pic_type_bot_v6(struct s5p_mfc_ctx *ctx)
2026{ 2026{
2027 return s5p_mfc_read_info_v6(ctx, 2027 return s5p_mfc_read_info_v6(ctx,
2028 (unsigned int) ctx->dev->mfc_regs->d_ret_picture_tag_bot); 2028 (__force unsigned int) ctx->dev->mfc_regs->d_ret_picture_tag_bot);
2029} 2029}
2030 2030
2031static unsigned int s5p_mfc_get_crop_info_h_v6(struct s5p_mfc_ctx *ctx) 2031static unsigned int s5p_mfc_get_crop_info_h_v6(struct s5p_mfc_ctx *ctx)
2032{ 2032{
2033 return s5p_mfc_read_info_v6(ctx, 2033 return s5p_mfc_read_info_v6(ctx,
2034 (unsigned int) ctx->dev->mfc_regs->d_display_crop_info1); 2034 (__force unsigned int) ctx->dev->mfc_regs->d_display_crop_info1);
2035} 2035}
2036 2036
2037static unsigned int s5p_mfc_get_crop_info_v_v6(struct s5p_mfc_ctx *ctx) 2037static unsigned int s5p_mfc_get_crop_info_v_v6(struct s5p_mfc_ctx *ctx)
2038{ 2038{
2039 return s5p_mfc_read_info_v6(ctx, 2039 return s5p_mfc_read_info_v6(ctx,
2040 (unsigned int) ctx->dev->mfc_regs->d_display_crop_info2); 2040 (__force unsigned int) ctx->dev->mfc_regs->d_display_crop_info2);
2041} 2041}
2042 2042
2043static struct s5p_mfc_regs mfc_regs; 2043static struct s5p_mfc_regs mfc_regs;