From 8f95314e7464df6be7d83a5b8ed0909a0e4c1eca Mon Sep 17 00:00:00 2001
From: Karthik Jayakumar <kjayakum@codeaurora.org>
Date: Mon, 14 Sep 2020 14:17:53 -0700
Subject: [PATCH] msm: camera: sync: Fix imports for types

Fix the order of imports for to resolve cam_sync
typedef for kernel CFI.

CRs-Fixed: 2772200
Change-Id: I4e5e642e6b45412904585aaa68c0ef77fedeee2d
Signed-off-by: Karthik Jayakumar <kjayakum@codeaurora.org>
---
 drivers/cam_sync/cam_sync_private.h | 1 +
 drivers/cam_sync/cam_sync_util.c    | 5 ++---
 drivers/cam_sync/cam_sync_util.h    | 1 -
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/cam_sync/cam_sync_private.h b/drivers/cam_sync/cam_sync_private.h
index 2f270ae181..40ca3a99de 100644
--- a/drivers/cam_sync/cam_sync_private.h
+++ b/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>
diff --git a/drivers/cam_sync/cam_sync_util.c b/drivers/cam_sync/cam_sync_util.c
index 7e939fcbbb..7bc8c947e4 100644
--- a/drivers/cam_sync/cam_sync_util.c
+++ b/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);
 }
diff --git a/drivers/cam_sync/cam_sync_util.h b/drivers/cam_sync/cam_sync_util.h
index 00bceb6349..ebe5a8ffdb 100644
--- a/drivers/cam_sync/cam_sync_util.h
+++ b/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"