From d15c904c4739a85038709705d05d675ee1bcc74d Mon Sep 17 00:00:00 2001 From: Ivan Priest Date: Wed, 15 May 2019 12:19:39 +0100 Subject: [PATCH] [NEUS7920-477] wlbt: annotate service driver API Annotate service driver API calls with service ID. Also BT remove callback exit point. Change-Id: Id945c9ca61732abd0c604a1ff2f402b242357ba0 SCSC-Bug-Id: SSB-52765 Signed-off-by: Ivan Priest --- drivers/misc/samsung/scsc/scsc_service.c | 11 +++++++---- drivers/misc/samsung/scsc_bt/scsc_bt_module.c | 7 +++++++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/drivers/misc/samsung/scsc/scsc_service.c b/drivers/misc/samsung/scsc/scsc_service.c index 7aee37cd4df2..4040cef42010 100755 --- a/drivers/misc/samsung/scsc/scsc_service.c +++ b/drivers/misc/samsung/scsc/scsc_service.c @@ -252,7 +252,7 @@ int scsc_mx_service_start(struct scsc_service *service, scsc_mifram_ref ref) int r; struct timeval tval = {}; - SCSC_TAG_INFO(MXMAN, "\n"); + SCSC_TAG_INFO(MXMAN, "%d\n", service->id); #ifdef CONFIG_SCSC_CHV_SUPPORT if (chv_run) return 0; @@ -346,7 +346,7 @@ int scsc_mx_service_stop(struct scsc_service *service) int r; struct timeval tval = {}; - SCSC_TAG_INFO(MXMAN, "\n"); + SCSC_TAG_INFO(MXMAN, "%d\n", service->id); #ifdef CONFIG_SCSC_CHV_SUPPORT if (chv_run) return 0; @@ -519,7 +519,8 @@ int scsc_mx_service_close(struct scsc_service *service) bool empty; struct timeval tval = {}; - SCSC_TAG_INFO(MXMAN, "\n"); + SCSC_TAG_INFO(MXMAN, "%d\n", service->id); + mutex_lock(&srvman->api_access_mutex); #ifdef CONFIG_ANDROID wake_lock(&srvman->sm_wake_lock); @@ -581,7 +582,7 @@ struct scsc_service *scsc_mx_service_open(struct scsc_mx *mx, enum scsc_service_ bool empty; struct timeval tval = {}; - SCSC_TAG_INFO(MXMAN, "\n"); + SCSC_TAG_INFO(MXMAN, "%d\n", service->id); mutex_lock(&srvman->api_access_mutex); #ifdef CONFIG_ANDROID @@ -965,6 +966,8 @@ int scsc_service_force_panic(struct scsc_service *service) { struct mxman *mxman = scsc_mx_get_mxman(service->mx); + SCSC_TAG_INFO(MXMAN, "%d\n", service->id); + return mxman_force_panic(mxman); } EXPORT_SYMBOL(scsc_service_force_panic); diff --git a/drivers/misc/samsung/scsc_bt/scsc_bt_module.c b/drivers/misc/samsung/scsc_bt/scsc_bt_module.c index de7d4d376a39..b2aa1fac0155 100755 --- a/drivers/misc/samsung/scsc_bt/scsc_bt_module.c +++ b/drivers/misc/samsung/scsc_bt/scsc_bt_module.c @@ -1476,6 +1476,7 @@ static void slsi_bt_service_remove(struct scsc_mx_module_client *module_client, /* Wait forever for recovery_release_complete, as it will * arrive even if autorecovery is disabled. */ + SCSC_TAG_INFO(BT_COMMON, "wait for recovery_release_complete\n"); wait_for_completion(&bt_service.recovery_release_complete); reinit_completion(&bt_service.recovery_release_complete); @@ -1498,6 +1499,9 @@ static void slsi_bt_service_remove(struct scsc_mx_module_client *module_client, done: mutex_unlock(&bt_start_mutex); + + SCSC_TAG_INFO(BT_COMMON, + "BT service remove complete (%s %p)\n", module_client->name, mx); } /* BT service driver registration interface */ @@ -1588,6 +1592,9 @@ static void slsi_ant_service_remove(struct scsc_mx_module_client *module_client, done: mutex_unlock(&ant_start_mutex); + + SCSC_TAG_INFO(BT_COMMON, + "ANT service remove complete (%s %p)\n", module_client->name, mx); } #endif -- 2.20.1