Merge "msm: camera: isp: Fix the callback arguments in IFE" into camera-kernel.lnx.4.0

This commit is contained in:
Haritha Chintalapati
2020-11-05 14:03:55 -08:00
committed by Gerrit - the friendly Code Review server

View File

@@ -7721,7 +7721,7 @@ static int cam_ife_hw_mgr_handle_hw_rup(
if (atomic_read(&ife_hw_mgr_ctx->overflow_pending))
break;
ife_hwr_irq_rup_cb(ife_hw_mgr_ctx->common.cb_priv,
CAM_ISP_HW_EVENT_REG_UPDATE, &rup_event_data);
CAM_ISP_HW_EVENT_REG_UPDATE, (void *)&rup_event_data);
break;
case CAM_ISP_HW_VFE_IN_RDI0:
@@ -7733,7 +7733,7 @@ static int cam_ife_hw_mgr_handle_hw_rup(
if (atomic_read(&ife_hw_mgr_ctx->overflow_pending))
break;
ife_hwr_irq_rup_cb(ife_hw_mgr_ctx->common.cb_priv,
CAM_ISP_HW_EVENT_REG_UPDATE, &rup_event_data);
CAM_ISP_HW_EVENT_REG_UPDATE, (void *)&rup_event_data);
break;
case CAM_ISP_HW_VFE_IN_PDLIB:
@@ -7771,7 +7771,7 @@ static int cam_ife_hw_mgr_handle_hw_epoch(
epoch_done_event_data.frame_id_meta = event_info->reg_val;
ife_hw_irq_epoch_cb(ife_hw_mgr_ctx->common.cb_priv,
CAM_ISP_HW_EVENT_EPOCH, &epoch_done_event_data);
CAM_ISP_HW_EVENT_EPOCH, (void *)&epoch_done_event_data);
break;
@@ -7839,7 +7839,7 @@ static int cam_ife_hw_mgr_handle_hw_sof(
break;
ife_hw_irq_sof_cb(ife_hw_mgr_ctx->common.cb_priv,
CAM_ISP_HW_EVENT_SOF, &sof_done_event_data);
CAM_ISP_HW_EVENT_SOF, (void *)&sof_done_event_data);
break;
@@ -7855,7 +7855,7 @@ static int cam_ife_hw_mgr_handle_hw_sof(
if (atomic_read(&ife_hw_mgr_ctx->overflow_pending))
break;
ife_hw_irq_sof_cb(ife_hw_mgr_ctx->common.cb_priv,
CAM_ISP_HW_EVENT_SOF, &sof_done_event_data);
CAM_ISP_HW_EVENT_SOF, (void *)&sof_done_event_data);
break;
case CAM_ISP_HW_VFE_IN_PDLIB:
@@ -7892,7 +7892,7 @@ static int cam_ife_hw_mgr_handle_hw_eof(
break;
ife_hw_irq_eof_cb(ife_hw_mgr_ctx->common.cb_priv,
CAM_ISP_HW_EVENT_EOF, &eof_done_event_data);
CAM_ISP_HW_EVENT_EOF, (void *)&eof_done_event_data);
break;
@@ -7939,7 +7939,7 @@ static int cam_ife_hw_mgr_handle_hw_buf_done(
if (buf_done_event_data.num_handles > 0 && ife_hwr_irq_wm_done_cb) {
CAM_DBG(CAM_ISP, "Notify ISP context");
ife_hwr_irq_wm_done_cb(ife_hw_mgr_ctx->common.cb_priv,
CAM_ISP_HW_EVENT_DONE, &buf_done_event_data);
CAM_ISP_HW_EVENT_DONE, (void *)&buf_done_event_data);
}
CAM_DBG(CAM_ISP,