From: Wooyeon Kim Date: Fri, 22 Mar 2019 07:22:25 +0000 (+0900) Subject: [COMMON] fimc-is2: modify fimc_is_lib_isp_shot return type X-Git-Tag: MMI-PSB29.39-49-7~147 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e299d8af08eee8e6d9e907ff49b26cbd72a1c339;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git [COMMON] fimc-is2: modify fimc_is_lib_isp_shot return type - for result from DDK, modified type void -> int PR JIRA ID: CPR-856 CRs-fixed: (CR) Change-Id: I4a8a759738ff3e1687f39da9ca48385888f563c1 Signed-off-by: Wooyeon Kim Reviewed-on: https://gerrit.mot.com/1326262 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Dawei Wang Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- diff --git a/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-3aa.c b/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-3aa.c index 503eaa855e27..ae62a495d352 100644 --- a/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-3aa.c +++ b/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-3aa.c @@ -514,7 +514,7 @@ config: frame->instance, hw_ip); } - fimc_is_lib_isp_shot(hw_ip, &hw_3aa->lib[frame->instance], param_set, frame->shot); + ret = fimc_is_lib_isp_shot(hw_ip, &hw_3aa->lib[frame->instance], param_set, frame->shot); set_bit(HW_CONFIG, &hw_ip->state); diff --git a/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-isp.c b/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-isp.c index 72790302d8de..b4f36b15fe6e 100644 --- a/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-isp.c +++ b/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-isp.c @@ -477,7 +477,7 @@ config: } ret = fimc_is_hw_isp_set_yuv_range(hw_ip, param_set, frame->fcount, hw_map); - fimc_is_lib_isp_shot(hw_ip, &hw_isp->lib[frame->instance], param_set, frame->shot); + ret |= fimc_is_lib_isp_shot(hw_ip, &hw_isp->lib[frame->instance], param_set, frame->shot); set_bit(HW_CONFIG, &hw_ip->state); diff --git a/drivers/media/platform/exynos/fimc-is2/interface/fimc-is-interface-ddk.c b/drivers/media/platform/exynos/fimc-is2/interface/fimc-is-interface-ddk.c index d8eb782d6f65..272ad6466b40 100644 --- a/drivers/media/platform/exynos/fimc-is2/interface/fimc-is-interface-ddk.c +++ b/drivers/media/platform/exynos/fimc-is2/interface/fimc-is-interface-ddk.c @@ -730,16 +730,16 @@ int __nocfi fimc_is_lib_isp_set_ctrl(struct fimc_is_hw_ip *hw_ip, return 0; } -void __nocfi fimc_is_lib_isp_shot(struct fimc_is_hw_ip *hw_ip, +int __nocfi fimc_is_lib_isp_shot(struct fimc_is_hw_ip *hw_ip, struct fimc_is_lib_isp *this, void *param_set, struct camera2_shot *shot) { int ret = 0; - FIMC_BUG_VOID(!hw_ip); - FIMC_BUG_VOID(!this); - FIMC_BUG_VOID(!param_set); - FIMC_BUG_VOID(!this->func); - FIMC_BUG_VOID(!this->object); + FIMC_BUG(!hw_ip); + FIMC_BUG(!this); + FIMC_BUG(!param_set); + FIMC_BUG(!this->func); + FIMC_BUG(!this->object); switch (hw_ip->id) { case DEV_HW_3AA0: @@ -778,6 +778,8 @@ void __nocfi fimc_is_lib_isp_shot(struct fimc_is_hw_ip *hw_ip, err_lib("invalid hw (%d)", hw_ip->id); break; } + + return ret; } int __nocfi fimc_is_lib_isp_get_meta(struct fimc_is_hw_ip *hw_ip, diff --git a/drivers/media/platform/exynos/fimc-is2/interface/fimc-is-interface-ddk.h b/drivers/media/platform/exynos/fimc-is2/interface/fimc-is-interface-ddk.h index a0446efee290..3b024e9be97f 100644 --- a/drivers/media/platform/exynos/fimc-is2/interface/fimc-is-interface-ddk.h +++ b/drivers/media/platform/exynos/fimc-is2/interface/fimc-is-interface-ddk.h @@ -245,7 +245,7 @@ int fimc_is_lib_isp_set_param(struct fimc_is_hw_ip *hw_ip, struct fimc_is_lib_isp *this, void *param); int fimc_is_lib_isp_set_ctrl(struct fimc_is_hw_ip *hw_ip, struct fimc_is_lib_isp *this, struct fimc_is_frame *frame); -void fimc_is_lib_isp_shot(struct fimc_is_hw_ip *hw_ip, +int fimc_is_lib_isp_shot(struct fimc_is_hw_ip *hw_ip, struct fimc_is_lib_isp *this, void *param_set, struct camera2_shot *shot); int fimc_is_lib_isp_get_meta(struct fimc_is_hw_ip *hw_ip, struct fimc_is_lib_isp *this, struct fimc_is_frame *frame);