Merge "iris: rename msm_vidc_suspend_locked to msm_vidc_suspend"

driver/vidc/inc/msm_vidc_driver.h

@@ -484,7 +484,7 @@ int msm_vidc_trigger_stability(struct msm_vidc_core *core,
 void msm_vidc_stability_handler(struct work_struct *work);
 int cancel_stability_work_sync(struct msm_vidc_inst *inst);
 void msm_vidc_fw_unload_handler(struct work_struct *work);
-int msm_vidc_suspend_locked(struct msm_vidc_core *core);
+int msm_vidc_suspend(struct msm_vidc_core *core);
 void msm_vidc_batch_handler(struct work_struct *work);
 int msm_vidc_event_queue_init(struct msm_vidc_inst *inst);
 int msm_vidc_event_queue_deinit(struct msm_vidc_inst *inst);

driver/vidc/src/msm_vidc_driver.c

@@ -235,7 +235,7 @@ static u32 msm_vidc_get_buffer_stats_flag(struct msm_vidc_inst *inst)
 	return flags;
 }
 
-int msm_vidc_suspend_locked(struct msm_vidc_core *core)
+int msm_vidc_suspend(struct msm_vidc_core *core)
 {
 	int rc = 0;
 

driver/vidc/src/msm_vidc_probe.c

@@ -960,7 +960,7 @@ static int msm_vidc_pm_suspend(struct device *dev)
 	}
 
 	d_vpr_h("%s\n", __func__);
-	rc = msm_vidc_suspend_locked(core);
+	rc = msm_vidc_suspend(core);
 	if (rc == -ENOTSUPP)
 		rc = 0;
 	else if (rc)