[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 <wooy88.kim@samsung.com>
Reviewed-on: https://gerrit.mot.com/1326262
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Dawei Wang <wangdw10@motorola.com>
Reviewed-by: Zhichao Chen <chenzc2@motorola.com>
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 503eaa855e27f0cee2c8d9518bfab663a407b83f..ae62a495d3522bd750468bc65f22d95d2b72af91 100644 (file)
--- 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 72790302d8decc373746a37ed04a33df252f660a..b4f36b15fe6e707729ce43cfebade3511c3afcb0 100644 (file)
--- 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 d8eb782d6f655ba1eed6d64ce9fe192894c7951f..272ad6466b404220a8acbde3b367e5eef8dc528d 100644 (file)
--- 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 a0446efee2901025f4362d5c790380860640ffd9..3b024e9be97fc682b880f38aaf7329cb331d930e 100644 (file)
--- 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);