diff --git a/driver/vidc/inc/msm_vidc_driver.h b/driver/vidc/inc/msm_vidc_driver.h
index a66000321b..230ac8e052 100644
--- a/driver/vidc/inc/msm_vidc_driver.h
+++ b/driver/vidc/inc/msm_vidc_driver.h
@@ -18,63 +18,63 @@
 
 enum msm_vidc_debugfs_event;
 
-static inline is_decode_session(struct msm_vidc_inst *inst)
+static inline bool is_decode_session(struct msm_vidc_inst *inst)
 {
 	return inst->domain == MSM_VIDC_DECODER;
 }
 
-static inline is_encode_session(struct msm_vidc_inst *inst)
+static inline bool is_encode_session(struct msm_vidc_inst *inst)
 {
 	return inst->domain == MSM_VIDC_ENCODER;
 }
 
-static inline is_image_encode_session(struct msm_vidc_inst *inst)
+static inline bool is_image_encode_session(struct msm_vidc_inst *inst)
 {
 	return inst->codec == MSM_VIDC_HEIC && inst->domain == MSM_VIDC_ENCODER;
 }
 
-static inline is_image_decode_session(struct msm_vidc_inst *inst)
+static inline bool is_image_decode_session(struct msm_vidc_inst *inst)
 {
 	return inst->codec == MSM_VIDC_HEIC && inst->domain == MSM_VIDC_DECODER;
 }
 
-static inline is_image_session(struct msm_vidc_inst *inst)
+static inline bool is_image_session(struct msm_vidc_inst *inst)
 {
 	return inst->codec == MSM_VIDC_HEIC;
 }
 
-static inline is_secure_session(struct msm_vidc_inst *inst)
+static inline bool is_secure_session(struct msm_vidc_inst *inst)
 {
 	return !!(inst->capabilities->cap[SECURE_MODE].value);
 }
 
-static inline is_input_buffer(enum msm_vidc_buffer_type buffer_type)
+static inline bool is_input_buffer(enum msm_vidc_buffer_type buffer_type)
 {
 	return buffer_type == MSM_VIDC_BUF_INPUT;
 }
 
-static inline is_output_buffer(enum msm_vidc_buffer_type buffer_type)
+static inline bool is_output_buffer(enum msm_vidc_buffer_type buffer_type)
 {
 	return buffer_type == MSM_VIDC_BUF_OUTPUT;
 }
 
-static inline is_input_meta_buffer(enum msm_vidc_buffer_type buffer_type)
+static inline bool is_input_meta_buffer(enum msm_vidc_buffer_type buffer_type)
 {
 	return buffer_type == MSM_VIDC_BUF_INPUT_META;
 }
 
-static inline is_output_meta_buffer(enum msm_vidc_buffer_type buffer_type)
+static inline bool is_output_meta_buffer(enum msm_vidc_buffer_type buffer_type)
 {
 	return buffer_type == MSM_VIDC_BUF_OUTPUT_META;
 }
 
-static inline is_ts_reorder_allowed(struct msm_vidc_inst *inst)
+static inline bool is_ts_reorder_allowed(struct msm_vidc_inst *inst)
 {
 	return !!(inst->capabilities->cap[TS_REORDER].value &&
 		is_decode_session(inst) && !is_image_session(inst));
 }
 
-static inline is_scaling_enabled(struct msm_vidc_inst *inst)
+static inline bool is_scaling_enabled(struct msm_vidc_inst *inst)
 {
 	return inst->crop.left != inst->compose.left ||
 		inst->crop.top != inst->compose.top ||
@@ -82,13 +82,13 @@ static inline is_scaling_enabled(struct msm_vidc_inst *inst)
 		inst->crop.height != inst->compose.height;
 }
 
-static inline is_rotation_90_or_270(struct msm_vidc_inst *inst)
+static inline bool is_rotation_90_or_270(struct msm_vidc_inst *inst)
 {
 	return inst->capabilities->cap[ROTATION].value == 90 ||
 		inst->capabilities->cap[ROTATION].value == 270;
 }
 
-static inline is_internal_buffer(enum msm_vidc_buffer_type buffer_type)
+static inline bool is_internal_buffer(enum msm_vidc_buffer_type buffer_type)
 {
 	return buffer_type == MSM_VIDC_BUF_BIN ||
 		buffer_type == MSM_VIDC_BUF_ARP ||
diff --git a/driver/vidc/src/msm_vdec.c b/driver/vidc/src/msm_vdec.c
index 7596fa6fac..ea64f9cfa4 100644
--- a/driver/vidc/src/msm_vdec.c
+++ b/driver/vidc/src/msm_vdec.c
@@ -2133,7 +2133,7 @@ int msm_vdec_qbuf(struct msm_vidc_inst *inst, struct vb2_buffer *vb2)
 	return rc;
 }
 
-static msm_vdec_alloc_and_queue_additional_dpb_buffers(struct msm_vidc_inst *inst)
+static int msm_vdec_alloc_and_queue_additional_dpb_buffers(struct msm_vidc_inst *inst)
 {
 	struct msm_vidc_buffers *buffers;
 	struct msm_vidc_buffer *buffer = NULL;
diff --git a/driver/vidc/src/msm_vidc_control.c b/driver/vidc/src/msm_vidc_control.c
index fa2531edf1..bd68cd1d74 100644
--- a/driver/vidc/src/msm_vidc_control.c
+++ b/driver/vidc/src/msm_vidc_control.c
@@ -3981,7 +3981,7 @@ int msm_vidc_set_blur_resolution(void *instance,
 	return rc;
 }
 
-static msm_venc_set_csc_coeff(struct msm_vidc_inst *inst,
+static int msm_venc_set_csc_coeff(struct msm_vidc_inst *inst,
 	const char *prop_name, u32 hfi_id, void *payload,
 	u32 payload_size, u32 row_count, u32 column_count)
 {