Merge "msm: camera: sync: Fix imports for types" into camera-kernel.lnx.4.0

drivers/cam_sync/cam_sync_private.h

@@ -16,6 +16,7 @@
 #include <media/v4l2-subdev.h>
 #include <media/v4l2-event.h>
 #include <media/v4l2-ioctl.h>
+#include "cam_sync_api.h"
 
 #if IS_REACHABLE(CONFIG_MSM_GLOBAL_SYNX)
 #include <synx_api.h>

drivers/cam_sync/cam_sync_util.c

@@ -291,10 +291,9 @@ void cam_sync_util_cb_dispatch(struct work_struct *cb_dispatch_work)
 	struct sync_callback_info *cb_info = container_of(cb_dispatch_work,
 		struct sync_callback_info,
 		cb_dispatch_work);
+	sync_callback sync_data = cb_info->callback_func;
 
-	cb_info->callback_func(cb_info->sync_obj,
-		cb_info->status,
-		cb_info->cb_data);
+	sync_data(cb_info->sync_obj, cb_info->status, cb_info->cb_data);
 
 	kfree(cb_info);
 }

drivers/cam_sync/cam_sync_util.h

@@ -7,7 +7,6 @@
 #define __CAM_SYNC_UTIL_H__
 
 
-#include <cam_sync_api.h>
 #include "cam_sync_private.h"
 #include "cam_debug_util.h"