Logging cleanup: HIDH, BNEP, and PAN.

Change-Id: I3b81b6875c764f0642be4f4d8905aa24524ea902

3 files changed, 68 insertions, 68 deletions

diff --git a/stack/pan/pan_api.c b/stack/pan/pan_api.c
index 29496f32a..d9bafbbee 100644
--- a/stack/pan/pan_api.c
+++ b/stack/pan/pan_api.c
@@ -147,14 +147,14 @@ tPAN_RESULT PAN_SetRole (UINT8 role,
     if ((!(role & (PAN_ROLE_CLIENT | PAN_ROLE_GN_SERVER | PAN_ROLE_NAP_SERVER))) &&
         role != PAN_ROLE_INACTIVE)
     {
-        PAN_TRACE_ERROR1 ("PAN role %d is invalid", role);
+        PAN_TRACE_ERROR ("PAN role %d is invalid", role);
         return PAN_FAILURE;
     }
 
     /* If the current active role is same as the role being set do nothing */
     if (pan_cb.role == role)
     {
-        PAN_TRACE_EVENT1 ("PAN role already was set to: %d", role);
+        PAN_TRACE_EVENT ("PAN role already was set to: %d", role);
         return PAN_SUCCESS;
     }
 
@@ -164,7 +164,7 @@ tPAN_RESULT PAN_SetRole (UINT8 role,
         p_sec = sec_mask;
 
     /* Register all the roles with SDP */
-    PAN_TRACE_API1 ("PAN_SetRole() called with role 0x%x", role);
+    PAN_TRACE_API ("PAN_SetRole() called with role 0x%x", role);
 #if (defined (PAN_SUPPORTS_ROLE_NAP) && PAN_SUPPORTS_ROLE_NAP == TRUE)
     /* Check the service name */
     if ((p_nap_name == NULL) || (*p_nap_name == 0))
@@ -265,7 +265,7 @@ tPAN_RESULT PAN_SetRole (UINT8 role,
         pan_close_all_connections ();
 
     pan_cb.role = role;
-    PAN_TRACE_EVENT1 ("PAN role set to: %d", role);
+    PAN_TRACE_EVENT ("PAN role set to: %d", role);
     return PAN_SUCCESS;
 }
 
@@ -311,7 +311,7 @@ tPAN_RESULT PAN_Connect (BD_ADDR rem_bda, UINT8 src_role, UINT8 dst_role, UINT16
     /* Check if PAN is active or not */
     if (!(pan_cb.role & src_role))
     {
-        PAN_TRACE_ERROR1 ("PAN is not active for the role %d", src_role);
+        PAN_TRACE_ERROR ("PAN is not active for the role %d", src_role);
         return PAN_FAILURE;
     }
 
@@ -319,7 +319,7 @@ tPAN_RESULT PAN_Connect (BD_ADDR rem_bda, UINT8 src_role, UINT8 dst_role, UINT16
     if ((src_role != PAN_ROLE_CLIENT && src_role != PAN_ROLE_GN_SERVER && src_role != PAN_ROLE_NAP_SERVER) ||
         (dst_role != PAN_ROLE_CLIENT && dst_role != PAN_ROLE_GN_SERVER && dst_role != PAN_ROLE_NAP_SERVER))
     {
-        PAN_TRACE_ERROR2 ("Either source %d or destination role %d is invalid", src_role, dst_role);
+        PAN_TRACE_ERROR ("Either source %d or destination role %d is invalid", src_role, dst_role);
         return PAN_FAILURE;
     }
 
@@ -336,7 +336,7 @@ tPAN_RESULT PAN_Connect (BD_ADDR rem_bda, UINT8 src_role, UINT8 dst_role, UINT16
             ** because if there is already a connection we cannot accept
             ** another connection in PANU role
             */
-            PAN_TRACE_ERROR0 ("Cannot make PANU connections when there are more than one connection");
+            PAN_TRACE_ERROR ("Cannot make PANU connections when there are more than one connection");
             return PAN_INVALID_SRC_ROLE;
         }
 
@@ -363,7 +363,7 @@ tPAN_RESULT PAN_Connect (BD_ADDR rem_bda, UINT8 src_role, UINT8 dst_role, UINT16
     {
         if (pan_cb.num_conns && pan_cb.active_role == PAN_ROLE_CLIENT && !pcb)
         {
-            PAN_TRACE_ERROR0 ("Device already have a connection in PANU role");
+            PAN_TRACE_ERROR ("Device already have a connection in PANU role");
             return PAN_INVALID_SRC_ROLE;
         }
 
@@ -383,7 +383,7 @@ tPAN_RESULT PAN_Connect (BD_ADDR rem_bda, UINT8 src_role, UINT8 dst_role, UINT16
     /* The role combination is not valid */
     else
     {
-        PAN_TRACE_ERROR2 ("Source %d and Destination roles %d are not valid combination",
+        PAN_TRACE_ERROR ("Source %d and Destination roles %d are not valid combination",
             src_role, dst_role);
         return PAN_FAILURE;
     }
@@ -393,12 +393,12 @@ tPAN_RESULT PAN_Connect (BD_ADDR rem_bda, UINT8 src_role, UINT8 dst_role, UINT16
         pcb = pan_allocate_pcb (rem_bda, BNEP_INVALID_HANDLE);
     if (!pcb)
     {
-        PAN_TRACE_ERROR0 ("PAN Connection failed because of no resources");
+        PAN_TRACE_ERROR ("PAN Connection failed because of no resources");
         return PAN_NO_RESOURCES;
     }
     BTM_SetOutService(rem_bda, BTM_SEC_SERVICE_BNEP_PANU, mx_chan_id);
 
-    PAN_TRACE_API6 ("PAN_Connect() for BD Addr %x.%x.%x.%x.%x.%x",
+    PAN_TRACE_API ("PAN_Connect() for BD Addr %x.%x.%x.%x.%x.%x",
         rem_bda[0], rem_bda[1], rem_bda[2], rem_bda[3], rem_bda[4], rem_bda[5]);
     if (pcb->con_state == PAN_STATE_IDLE)
     {
@@ -429,7 +429,7 @@ tPAN_RESULT PAN_Connect (BD_ADDR rem_bda, UINT8 src_role, UINT8 dst_role, UINT16
         return result;
     }
 
-    PAN_TRACE_DEBUG1 ("PAN_Connect() current active role set to %d", src_role);
+    PAN_TRACE_DEBUG ("PAN_Connect() current active role set to %d", src_role);
     pan_cb.prv_active_role = pan_cb.active_role;
     pan_cb.active_role = src_role;
     *handle = pcb->handle;
@@ -461,7 +461,7 @@ tPAN_RESULT PAN_Disconnect (UINT16 handle)
     pcb = pan_get_pcb_by_handle (handle);
     if(!pcb)
     {
-        PAN_TRACE_ERROR1 ("PAN connection not found for the handle %d", handle);
+        PAN_TRACE_ERROR ("PAN connection not found for the handle %d", handle);
         return PAN_FAILURE;
     }
 
@@ -476,11 +476,11 @@ tPAN_RESULT PAN_Disconnect (UINT16 handle)
 
     if (result != BNEP_SUCCESS)
     {
-        PAN_TRACE_EVENT0 ("Error in closing PAN connection");
+        PAN_TRACE_EVENT ("Error in closing PAN connection");
         return PAN_FAILURE;
     }
 
-    PAN_TRACE_EVENT0 ("PAN connection closed");
+    PAN_TRACE_EVENT ("PAN connection closed");
     return PAN_SUCCESS;
 }
 
@@ -512,7 +512,7 @@ tPAN_RESULT PAN_Write(UINT16 handle, BD_ADDR dst, BD_ADDR src, UINT16 protocol,
     BT_HDR *buffer;
 
     if (pan_cb.role == PAN_ROLE_INACTIVE || !pan_cb.num_conns) {
-        PAN_TRACE_ERROR1("%s PAN is not active, data write failed.", __func__);
+        PAN_TRACE_ERROR("%s PAN is not active, data write failed.", __func__);
         return PAN_FAILURE;
     }
 
@@ -531,7 +531,7 @@ tPAN_RESULT PAN_Write(UINT16 handle, BD_ADDR dst, BD_ADDR src, UINT16 protocol,
 
     buffer = (BT_HDR *)GKI_getpoolbuf(PAN_POOL_ID);
     if (!buffer) {
-        PAN_TRACE_ERROR1("%s unable to acquire buffer from pool.", __func__);
+        PAN_TRACE_ERROR("%s unable to acquire buffer from pool.", __func__);
         return PAN_NO_RESOURCES;
     }
 
@@ -574,7 +574,7 @@ tPAN_RESULT PAN_WriteBuf (UINT16 handle, BD_ADDR dst, BD_ADDR src, UINT16 protoc
 
     if (pan_cb.role == PAN_ROLE_INACTIVE || (!(pan_cb.num_conns)))
     {
-        PAN_TRACE_ERROR0 ("PAN is not active Data write failed");
+        PAN_TRACE_ERROR ("PAN is not active Data write failed");
         GKI_freebuf (p_buf);
         return PAN_FAILURE;
     }
@@ -604,7 +604,7 @@ tPAN_RESULT PAN_WriteBuf (UINT16 handle, BD_ADDR dst, BD_ADDR src, UINT16 protoc
 
         if (i == MAX_PAN_CONNS)
         {
-            PAN_TRACE_ERROR0 ("PAN Don't have any user connections");
+            PAN_TRACE_ERROR ("PAN Don't have any user connections");
             GKI_freebuf (p_buf);
             return PAN_FAILURE;
         }
@@ -612,16 +612,16 @@ tPAN_RESULT PAN_WriteBuf (UINT16 handle, BD_ADDR dst, BD_ADDR src, UINT16 protoc
         result = BNEP_WriteBuf (pan_cb.pcb[i].handle, dst, p_buf, protocol, src, ext);
         if (result == BNEP_IGNORE_CMD)
         {
-            PAN_TRACE_DEBUG0 ("PAN ignored data write for PANU connection");
+            PAN_TRACE_DEBUG ("PAN ignored data write for PANU connection");
             return result;
         }
         else if (result != BNEP_SUCCESS)
         {
-            PAN_TRACE_ERROR0 ("PAN failed to write data for the PANU connection");
+            PAN_TRACE_ERROR ("PAN failed to write data for the PANU connection");
             return result;
         }
 
-        PAN_TRACE_DEBUG0 ("PAN successfully wrote data for the PANU connection");
+        PAN_TRACE_DEBUG ("PAN successfully wrote data for the PANU connection");
         return PAN_SUCCESS;
     }
 
@@ -629,14 +629,14 @@ tPAN_RESULT PAN_WriteBuf (UINT16 handle, BD_ADDR dst, BD_ADDR src, UINT16 protoc
     pcb = pan_get_pcb_by_handle (handle);
     if (!pcb)
     {
-        PAN_TRACE_ERROR0 ("PAN Buf write for wrong handle");
+        PAN_TRACE_ERROR ("PAN Buf write for wrong handle");
         GKI_freebuf (p_buf);
         return PAN_FAILURE;
     }
 
     if (pcb->con_state != PAN_STATE_CONNECTED)
     {
-        PAN_TRACE_ERROR0 ("PAN Buf write when conn is not active");
+        PAN_TRACE_ERROR ("PAN Buf write when conn is not active");
         GKI_freebuf (p_buf);
         return PAN_FAILURE;
     }
@@ -644,16 +644,16 @@ tPAN_RESULT PAN_WriteBuf (UINT16 handle, BD_ADDR dst, BD_ADDR src, UINT16 protoc
     result = BNEP_WriteBuf (pcb->handle, dst, p_buf, protocol, src, ext);
     if (result == BNEP_IGNORE_CMD)
     {
-        PAN_TRACE_DEBUG0 ("PAN ignored data buf write to PANU");
+        PAN_TRACE_DEBUG ("PAN ignored data buf write to PANU");
         return result;
     }
     else if (result != BNEP_SUCCESS)
     {
-        PAN_TRACE_ERROR0 ("PAN failed to send data buf to the PANU");
+        PAN_TRACE_ERROR ("PAN failed to send data buf to the PANU");
         return result;
     }
 
-    PAN_TRACE_DEBUG0 ("PAN successfully sent data buf to the PANU");
+    PAN_TRACE_DEBUG ("PAN successfully sent data buf to the PANU");
     return PAN_SUCCESS;
 }
 
@@ -687,18 +687,18 @@ tPAN_RESULT PAN_SetProtocolFilters (UINT16 handle,
     pcb = pan_get_pcb_by_handle (handle);
     if(!pcb)
     {
-        PAN_TRACE_ERROR1 ("PAN connection not found for the handle %d", handle);
+        PAN_TRACE_ERROR ("PAN connection not found for the handle %d", handle);
         return PAN_FAILURE;
     }
 
     result = BNEP_SetProtocolFilters (pcb->handle, num_filters, p_start_array, p_end_array);
     if (result != BNEP_SUCCESS)
     {
-        PAN_TRACE_ERROR1 ("PAN failed to set protocol filters for handle %d", handle);
+        PAN_TRACE_ERROR ("PAN failed to set protocol filters for handle %d", handle);
         return result;
     }
 
-    PAN_TRACE_API1 ("PAN successfully sent protocol filters for handle %d", handle);
+    PAN_TRACE_API ("PAN successfully sent protocol filters for handle %d", handle);
     return PAN_SUCCESS;
 #else
     return PAN_FAILURE;
@@ -736,7 +736,7 @@ tBNEP_RESULT PAN_SetMulticastFilters (UINT16 handle,
     pcb = pan_get_pcb_by_handle (handle);
     if(!pcb)
     {
-        PAN_TRACE_ERROR1 ("PAN connection not found for the handle %d", handle);
+        PAN_TRACE_ERROR ("PAN connection not found for the handle %d", handle);
         return PAN_FAILURE;
     }
 
@@ -744,11 +744,11 @@ tBNEP_RESULT PAN_SetMulticastFilters (UINT16 handle,
                             num_mcast_filters, p_start_array, p_end_array);
     if (result != BNEP_SUCCESS)
     {
-        PAN_TRACE_ERROR1 ("PAN failed to set multicast filters for handle %d", handle);
+        PAN_TRACE_ERROR ("PAN failed to set multicast filters for handle %d", handle);
         return result;
     }
 
-    PAN_TRACE_API1 ("PAN successfully sent multicast filters for handle %d", handle);
+    PAN_TRACE_API ("PAN successfully sent multicast filters for handle %d", handle);
     return PAN_SUCCESS;
 #else
     return PAN_FAILURE;
diff --git a/stack/pan/pan_main.c b/stack/pan/pan_main.c
index bfaced65c..8306df302 100644
--- a/stack/pan/pan_main.c
+++ b/stack/pan/pan_main.c
@@ -141,7 +141,7 @@ void pan_conn_ind_cb (UINT16 handle,
 
     if (wrong_uuid)
     {
-        PAN_TRACE_ERROR0 ("PAN Connection failed because of wrong remote UUID ");
+        PAN_TRACE_ERROR ("PAN Connection failed because of wrong remote UUID ");
         BNEP_ConnectResp (handle, BNEP_CONN_FAILED_SRC_UUID);
         return;
     }
@@ -175,17 +175,17 @@ void pan_conn_ind_cb (UINT16 handle,
 
     if (wrong_uuid)
     {
-        PAN_TRACE_ERROR0 ("PAN Connection failed because of wrong local UUID ");
+        PAN_TRACE_ERROR ("PAN Connection failed because of wrong local UUID ");
         BNEP_ConnectResp (handle, BNEP_CONN_FAILED_DST_UUID);
         return;
     }
 
-    PAN_TRACE_EVENT5 ("pan_conn_ind_cb - for handle %d, current role %d, dst uuid 0x%x, src uuid 0x%x, role change %s",
+    PAN_TRACE_EVENT ("pan_conn_ind_cb - for handle %d, current role %d, dst uuid 0x%x, src uuid 0x%x, role change %s",
         handle, pan_cb.role, local_uuid->uu.uuid16, remote_uuid->uu.uuid16, is_role_change?"YES":"NO");
     /* The acceptable UUID size is only 2 */
     if (remote_uuid->len != 2)
     {
-        PAN_TRACE_ERROR1 ("PAN Connection failed because of wrong UUID size %d", remote_uuid->len);
+        PAN_TRACE_ERROR ("PAN Connection failed because of wrong UUID size %d", remote_uuid->len);
         BNEP_ConnectResp (handle, BNEP_CONN_FAILED_UUID_SIZE);
         return;
     }
@@ -196,7 +196,7 @@ void pan_conn_ind_cb (UINT16 handle,
         remote_uuid->uu.uuid16 != UUID_SERVCLASS_NAP &&
         remote_uuid->uu.uuid16 != UUID_SERVCLASS_GN)
     {
-        PAN_TRACE_ERROR1 ("Src UUID 0x%x is not valid", remote_uuid->uu.uuid16);
+        PAN_TRACE_ERROR ("Src UUID 0x%x is not valid", remote_uuid->uu.uuid16);
         BNEP_ConnectResp (handle, BNEP_CONN_FAILED_SRC_UUID);
         return;
     }
@@ -206,7 +206,7 @@ void pan_conn_ind_cb (UINT16 handle,
         local_uuid->uu.uuid16 != UUID_SERVCLASS_NAP &&
         local_uuid->uu.uuid16 != UUID_SERVCLASS_GN)
     {
-        PAN_TRACE_ERROR1 ("Dst UUID 0x%x is not valid", remote_uuid->uu.uuid16);
+        PAN_TRACE_ERROR ("Dst UUID 0x%x is not valid", remote_uuid->uu.uuid16);
         BNEP_ConnectResp (handle, BNEP_CONN_FAILED_DST_UUID);
         return;
     }
@@ -219,7 +219,7 @@ void pan_conn_ind_cb (UINT16 handle,
         ((!(pan_cb.role & UUID_SERVCLASS_NAP))
         && local_uuid->uu.uuid16 == UUID_SERVCLASS_NAP))
     {
-        PAN_TRACE_ERROR1 ("PAN Connection failed because of unsupported destination UUID 0x%x", local_uuid->uu.uuid16);
+        PAN_TRACE_ERROR ("PAN Connection failed because of unsupported destination UUID 0x%x", local_uuid->uu.uuid16);
         BNEP_ConnectResp (handle, BNEP_CONN_FAILED_DST_UUID);
         return;
     }
@@ -243,7 +243,7 @@ void pan_conn_ind_cb (UINT16 handle,
             /* There are connections other than this one
             ** so we cann't accept PANU role. Reject
             */
-            PAN_TRACE_ERROR0 ("Dst UUID should be either GN or NAP only because there are other connections");
+            PAN_TRACE_ERROR ("Dst UUID should be either GN or NAP only because there are other connections");
             BNEP_ConnectResp (handle, BNEP_CONN_FAILED_DST_UUID);
             return;
         }
@@ -251,7 +251,7 @@ void pan_conn_ind_cb (UINT16 handle,
         /* If it is already in connected state check for bridging status */
         if (pcb->con_state == PAN_STATE_CONNECTED)
         {
-            PAN_TRACE_EVENT2 ("PAN Role changing New Src 0x%x Dst 0x%x",
+            PAN_TRACE_EVENT ("PAN Role changing New Src 0x%x Dst 0x%x",
                 remote_uuid->uu.uuid16, local_uuid->uu.uuid16);
 
             pcb->prv_src_uuid = pcb->src_uuid;
@@ -282,23 +282,23 @@ void pan_conn_ind_cb (UINT16 handle,
             (local_uuid->uu.uuid16 == UUID_SERVCLASS_PANU ||
             pan_cb.active_role == PAN_ROLE_CLIENT))
         {
-            PAN_TRACE_ERROR0 ("PAN already have a connection and can't be user");
+            PAN_TRACE_ERROR ("PAN already have a connection and can't be user");
             BNEP_ConnectResp (handle, BNEP_CONN_FAILED_DST_UUID);
             return;
         }
     }
 
     /* This is a new connection */
-    PAN_TRACE_DEBUG1 ("New connection indication for handle %d", handle);
+    PAN_TRACE_DEBUG ("New connection indication for handle %d", handle);
     pcb = pan_allocate_pcb (p_bda, handle);
     if (!pcb)
     {
-        PAN_TRACE_ERROR0 ("PAN no control block for new connection");
+        PAN_TRACE_ERROR ("PAN no control block for new connection");
         BNEP_ConnectResp (handle, BNEP_CONN_FAILED);
         return;
     }
 
-    PAN_TRACE_EVENT1 ("PAN connection destination UUID is 0x%x", local_uuid->uu.uuid16);
+    PAN_TRACE_EVENT ("PAN connection destination UUID is 0x%x", local_uuid->uu.uuid16);
     /* Set the latest active PAN role */
     pan_cb.active_role = req_role;
     pcb->src_uuid = local_uuid->uu.uuid16;
@@ -336,11 +336,11 @@ void pan_connect_state_cb (UINT16 handle, BD_ADDR rem_bda, tBNEP_RESULT result,
     UINT8            peer_role;
     UNUSED(rem_bda);
 
-    PAN_TRACE_EVENT2 ("pan_connect_state_cb - for handle %d, result %d", handle, result);
+    PAN_TRACE_EVENT ("pan_connect_state_cb - for handle %d, result %d", handle, result);
     pcb = pan_get_pcb_by_handle (handle);
     if (!pcb)
     {
-        PAN_TRACE_ERROR1 ("PAN State change indication for wrong handle %d", handle);
+        PAN_TRACE_ERROR ("PAN State change indication for wrong handle %d", handle);
         return;
     }
 
@@ -356,7 +356,7 @@ void pan_connect_state_cb (UINT16 handle, BD_ADDR rem_bda, tBNEP_RESULT result,
             (pcb->con_flags & PAN_FLAGS_CONN_COMPLETED))
         {
             /* restore the original values */
-            PAN_TRACE_EVENT0 ("restoring the connection state to active");
+            PAN_TRACE_EVENT ("restoring the connection state to active");
             pcb->con_state = PAN_STATE_CONNECTED;
             pcb->con_flags &= (~PAN_FLAGS_CONN_COMPLETED);
 
@@ -406,7 +406,7 @@ void pan_connect_state_cb (UINT16 handle, BD_ADDR rem_bda, tBNEP_RESULT result,
     /* Create bridge if the destination role is NAP */
     if (pan_cb.pan_bridge_req_cb && pcb->src_uuid == UUID_SERVCLASS_NAP)
     {
-        PAN_TRACE_EVENT0 ("PAN requesting for bridge");
+        PAN_TRACE_EVENT ("PAN requesting for bridge");
         (*pan_cb.pan_bridge_req_cb) (pcb->rem_bda, TRUE);
     }
 }
@@ -455,17 +455,17 @@ void pan_data_ind_cb (UINT16 handle,
     ** send it to the host system
     */
 
-    PAN_TRACE_EVENT1 ("pan_data_ind_cb - for handle %d", handle);
+    PAN_TRACE_EVENT ("pan_data_ind_cb - for handle %d", handle);
     pcb = pan_get_pcb_by_handle (handle);
     if (!pcb)
     {
-        PAN_TRACE_ERROR1 ("PAN Data indication for wrong handle %d", handle);
+        PAN_TRACE_ERROR ("PAN Data indication for wrong handle %d", handle);
         return;
     }
 
     if (pcb->con_state != PAN_STATE_CONNECTED)
     {
-        PAN_TRACE_ERROR2 ("PAN Data indication in wrong state %d for handle %d",
+        PAN_TRACE_ERROR ("PAN Data indication in wrong state %d for handle %d",
             pcb->con_state, handle);
         return;
     }
@@ -473,7 +473,7 @@ void pan_data_ind_cb (UINT16 handle,
     /* Check if it is broadcast packet */
     if (dst[0] & 0x01)
     {
-        PAN_TRACE_DEBUG2 ("PAN received broadcast packet on handle %d, src uuid 0x%x",
+        PAN_TRACE_DEBUG ("PAN received broadcast packet on handle %d, src uuid 0x%x",
             handle, pcb->src_uuid);
         for (i=0; i<MAX_PAN_CONNS; i++)
         {
@@ -554,14 +554,14 @@ void pan_data_buf_ind_cb (UINT16 handle,
     pcb = pan_get_pcb_by_handle (handle);
     if (!pcb)
     {
-        PAN_TRACE_ERROR1 ("PAN Data buffer indication for wrong handle %d", handle);
+        PAN_TRACE_ERROR ("PAN Data buffer indication for wrong handle %d", handle);
         GKI_freebuf (p_buf);
         return;
     }
 
     if (pcb->con_state != PAN_STATE_CONNECTED)
     {
-        PAN_TRACE_ERROR2 ("PAN Data indication in wrong state %d for handle %d",
+        PAN_TRACE_ERROR ("PAN Data indication in wrong state %d for handle %d",
             pcb->con_state, handle);
         GKI_freebuf (p_buf);
         return;
@@ -570,7 +570,7 @@ void pan_data_buf_ind_cb (UINT16 handle,
     p_data = (UINT8 *)(p_buf + 1) + p_buf->offset;
     len    = p_buf->len;
 
-    PAN_TRACE_EVENT4 ("pan_data_buf_ind_cb - for handle %d, protocol 0x%x, length %d, ext %d",
+    PAN_TRACE_EVENT ("pan_data_buf_ind_cb - for handle %d, protocol 0x%x, length %d, ext %d",
         handle, protocol, len, ext);
 
    if (pcb->src_uuid == UUID_SERVCLASS_NAP)
@@ -583,7 +583,7 @@ void pan_data_buf_ind_cb (UINT16 handle,
     {
         if (dst[0] & 0x01)
         {
-            PAN_TRACE_DEBUG2 ("PAN received broadcast packet on handle %d, src uuid 0x%x",
+            PAN_TRACE_DEBUG ("PAN received broadcast packet on handle %d, src uuid 0x%x",
                 handle, pcb->src_uuid);
             for (i=0; i<MAX_PAN_CONNS; i++)
             {
@@ -610,10 +610,10 @@ void pan_data_buf_ind_cb (UINT16 handle,
         dst_pcb = pan_get_pcb_by_addr (dst);
         if (dst_pcb)
         {
-            PAN_TRACE_EVENT0 ("pan_data_buf_ind_cb - destination PANU found and sending the data");
+            PAN_TRACE_EVENT ("pan_data_buf_ind_cb - destination PANU found and sending the data");
             result = BNEP_WriteBuf (dst_pcb->handle, dst, p_buf, protocol, src, ext);
             if (result != BNEP_SUCCESS && result != BNEP_IGNORE_CMD)
-                PAN_TRACE_ERROR1 ("Failed to write data for PAN connection handle %d", dst_pcb->handle);
+                PAN_TRACE_ERROR ("Failed to write data for PAN connection handle %d", dst_pcb->handle);
             return;
         }
     }
@@ -682,7 +682,7 @@ void pan_proto_filt_ind_cb (UINT16 handle,
                             UINT8 *p_filters)
 {
 #if (defined (BNEP_SUPPORTS_PROT_FILTERS) && BNEP_SUPPORTS_PROT_FILTERS == TRUE)
-    PAN_TRACE_EVENT4 ("pan_proto_filt_ind_cb - called for handle %d with ind %d, result %d, num %d",
+    PAN_TRACE_EVENT ("pan_proto_filt_ind_cb - called for handle %d with ind %d, result %d, num %d",
                             handle, indication, result, num_filters);
 
     if (pan_cb.pan_pfilt_ind_cb)
@@ -720,7 +720,7 @@ void pan_mcast_filt_ind_cb (UINT16 handle,
                             UINT8 *p_filters)
 {
 #if (defined (BNEP_SUPPORTS_MULTI_FILTERS) && BNEP_SUPPORTS_MULTI_FILTERS == TRUE)
-    PAN_TRACE_EVENT4 ("pan_mcast_filt_ind_cb - called for handle %d with ind %d, result %d, num %d",
+    PAN_TRACE_EVENT ("pan_mcast_filt_ind_cb - called for handle %d with ind %d, result %d, num %d",
                             handle, indication, result, num_filters);
 
     if (pan_cb.pan_mfilt_ind_cb)
diff --git a/stack/pan/pan_utils.c b/stack/pan/pan_utils.c
index 9ebbb759b..7a550fa65 100644
--- a/stack/pan/pan_utils.c
+++ b/stack/pan/pan_utils.c
@@ -71,7 +71,7 @@ UINT32 pan_register_with_sdp (UINT16 uuid, UINT8 sec_mask, char *p_name, char *p
 
     if (sdp_handle == 0)
     {
-        PAN_TRACE_ERROR0 ("PAN_SetRole - could not create SDP record");
+        PAN_TRACE_ERROR ("PAN_SetRole - could not create SDP record");
         return 0;
     }
 
@@ -133,7 +133,7 @@ UINT32 pan_register_with_sdp (UINT16 uuid, UINT8 sec_mask, char *p_name, char *p
          || (!BTM_SetSecurityLevel (FALSE, p_name, BTM_SEC_SERVICE_BNEP_NAP,
                                     sec_mask, BT_PSM_BNEP, BTM_SEC_PROTO_BNEP, UUID_SERVCLASS_NAP)))
         {
-            PAN_TRACE_ERROR0 ("PAN Security Registration failed for PANU");
+            PAN_TRACE_ERROR ("PAN Security Registration failed for PANU");
         }
     }
 #endif
@@ -145,7 +145,7 @@ UINT32 pan_register_with_sdp (UINT16 uuid, UINT8 sec_mask, char *p_name, char *p
          || (!BTM_SetSecurityLevel (FALSE, p_name, BTM_SEC_SERVICE_BNEP_GN,
                                     sec_mask, BT_PSM_BNEP, BTM_SEC_PROTO_BNEP, UUID_SERVCLASS_GN)))
         {
-            PAN_TRACE_ERROR0 ("PAN Security Registration failed for GN");
+            PAN_TRACE_ERROR ("PAN Security Registration failed for GN");
         }
     }
 #endif
@@ -157,7 +157,7 @@ UINT32 pan_register_with_sdp (UINT16 uuid, UINT8 sec_mask, char *p_name, char *p
          || (!BTM_SetSecurityLevel (FALSE, p_name, BTM_SEC_SERVICE_BNEP_PANU,
                                     sec_mask, BT_PSM_BNEP, BTM_SEC_PROTO_BNEP, UUID_SERVCLASS_PANU)))
         {
-            PAN_TRACE_ERROR0 ("PAN Security Registration failed for PANU");
+            PAN_TRACE_ERROR ("PAN Security Registration failed for PANU");
         }
     }
 #endif
@@ -332,7 +332,7 @@ void pan_dump_status (void)
     char            buff[200];
     tPAN_CONN      *p_pcb;
 
-    PAN_TRACE_DEBUG3 ("PAN role %x, active role %d, num_conns %d",
+    PAN_TRACE_DEBUG ("PAN role %x, active role %d, num_conns %d",
         pan_cb.role, pan_cb.active_role, pan_cb.num_conns);
 
     for (i = 0, p_pcb = pan_cb.pcb; i < MAX_PAN_CONNS; i++, p_pcb++)
@@ -342,7 +342,7 @@ void pan_dump_status (void)
             p_pcb->rem_bda[0], p_pcb->rem_bda[1], p_pcb->rem_bda[2],
             p_pcb->rem_bda[3], p_pcb->rem_bda[4], p_pcb->rem_bda[5]);
 
-        PAN_TRACE_DEBUG0 (buff);
+        PAN_TRACE_DEBUG (buff);
     }
 #endif
 }