Merge "system::stack: Comment out unused parameters" into main am: dbcd26d9a9 am: 502fddd449

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3110320

Change-Id: I3d9456093bd2fd81768580f4854a46b2810bcad6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

19 files changed, 112 insertions, 108 deletions

diff --git a/system/stack/Android.bp b/system/stack/Android.bp
index 2121cbdd91..fcdd01a356 100644
--- a/system/stack/Android.bp
+++ b/system/stack/Android.bp
@@ -291,7 +291,6 @@ cc_library_static {
         "BluetoothGeneratedDumpsysDataSchema_h",
     ],
     cflags: [
-        "-Wno-unused-parameter",
         /* we export all classes, so change default visibility, instead of having EXPORT_SYMBOL on each class*/
         "-fvisibility=default",
     ],
diff --git a/system/stack/btm/btm_ble_gap.cc b/system/stack/btm/btm_ble_gap.cc
index 309d562893..7cd4485073 100644
--- a/system/stack/btm/btm_ble_gap.cc
+++ b/system/stack/btm/btm_ble_gap.cc
@@ -45,14 +45,12 @@
 #include "osi/include/allocator.h"
 #include "osi/include/properties.h"
 #include "osi/include/stack_power_telemetry.h"
-#include "stack/acl/acl.h"
 #include "stack/btm/btm_ble_int.h"
 #include "stack/btm/btm_ble_int_types.h"
 #include "stack/btm/btm_dev.h"
 #include "stack/btm/btm_int_types.h"
 #include "stack/btm/btm_sec.h"
 #include "stack/btm/btm_sec_cb.h"
-#include "stack/gatt/gatt_int.h"
 #include "stack/include/acl_api.h"
 #include "stack/include/advertise_data_parser.h"
 #include "stack/include/ble_scanner.h"
@@ -64,6 +62,7 @@
 #include "stack/include/btm_ble_privacy.h"
 #include "stack/include/btm_log_history.h"
 #include "stack/include/gap_api.h"
+#include "stack/include/gattdefs.h"
 #include "stack/include/hci_error_code.h"
 #include "stack/include/inq_hci_link_interface.h"
 #include "types/ble_address_with_type.h"
diff --git a/system/stack/eatt/eatt_impl.h b/system/stack/eatt/eatt_impl.h
index a014a76db3..60964143c9 100644
--- a/system/stack/eatt/eatt_impl.h
+++ b/system/stack/eatt/eatt_impl.h
@@ -132,8 +132,9 @@ struct eatt_impl {
   }
 
   bool eatt_l2cap_connect_ind_common(const RawAddress& bda,
-                                     std::vector<uint16_t>& lcids, uint16_t psm,
-                                     uint16_t peer_mtu, uint8_t identifier) {
+                                     std::vector<uint16_t>& lcids,
+                                     uint16_t /* psm */, uint16_t peer_mtu,
+                                     uint8_t identifier) {
     /* The assumption is that L2CAP layer already check parameters etc.
      * Get our capabilities and accept all the channels.
      */
@@ -504,7 +505,7 @@ struct eatt_impl {
     }
   }
 
-  void eatt_l2cap_disconnect_ind(uint16_t lcid, bool please_confirm) {
+  void eatt_l2cap_disconnect_ind(uint16_t lcid, bool /* please_confirm */) {
     log::info("cid: 0x{:x}", lcid);
     eatt_device* eatt_dev = find_device_by_cid(lcid);
     if (!eatt_dev) {
diff --git a/system/stack/gap/gap_ble.cc b/system/stack/gap/gap_ble.cc
index f9d4e1cb7c..eb48f2fe6e 100644
--- a/system/stack/gap/gap_ble.cc
+++ b/system/stack/gap/gap_ble.cc
@@ -299,7 +299,7 @@ void cl_op_cmpl(tGAP_CLCB& clcb, bool status, uint16_t len, uint8_t* p_name) {
 
 /** Client connection callback */
 void client_connect_cback(tGATT_IF, const RawAddress& bda, uint16_t conn_id,
-                          bool connected, tGATT_DISCONN_REASON reason,
+                          bool connected, tGATT_DISCONN_REASON /* reason */,
                           tBT_TRANSPORT) {
   tGAP_CLCB* p_clcb = find_clcb_by_bd_addr(bda);
   if (p_clcb == NULL) {
diff --git a/system/stack/gap/gap_conn.cc b/system/stack/gap/gap_conn.cc
index 5c7dd6974f..88d216dab9 100644
--- a/system/stack/gap/gap_conn.cc
+++ b/system/stack/gap/gap_conn.cc
@@ -165,7 +165,7 @@ void gap_conn_init(void) {
  *                            GAP_INVALID_HANDLE
  *
  ******************************************************************************/
-uint16_t GAP_ConnOpen(const char* p_serv_name, uint8_t service_id,
+uint16_t GAP_ConnOpen(const char* /* p_serv_name */, uint8_t service_id,
                       bool is_server, const RawAddress* p_rem_bda, uint16_t psm,
                       uint16_t le_mps, tL2CAP_CFG_INFO* p_cfg,
                       tL2CAP_ERTM_INFO* ertm_info, uint16_t security,
@@ -588,7 +588,7 @@ void gap_tx_complete_ind(uint16_t l2cap_cid, uint16_t sdu_sent) {
  *
  ******************************************************************************/
 static void gap_connect_ind(const RawAddress& bd_addr, uint16_t l2cap_cid,
-                            uint16_t psm, uint8_t l2cap_id) {
+                            uint16_t psm, uint8_t /* l2cap_id */) {
   uint16_t xx;
   tGAP_CCB* p_ccb;
 
@@ -798,7 +798,7 @@ static void gap_config_ind(uint16_t l2cap_cid, tL2CAP_CFG_INFO* p_cfg) {
  * Returns          void
  *
  ******************************************************************************/
-static void gap_config_cfm(uint16_t l2cap_cid, uint16_t initiator,
+static void gap_config_cfm(uint16_t l2cap_cid, uint16_t /* initiator */,
                            tL2CAP_CFG_INFO* p_cfg) {
   gap_config_ind(l2cap_cid, p_cfg);
 
@@ -823,7 +823,7 @@ static void gap_config_cfm(uint16_t l2cap_cid, uint16_t initiator,
  * Returns          void
  *
  ******************************************************************************/
-static void gap_disconnect_ind(uint16_t l2cap_cid, bool ack_needed) {
+static void gap_disconnect_ind(uint16_t l2cap_cid, bool /* ack_needed */) {
   tGAP_CCB* p_ccb;
 
   /* Find CCB based on CID */
diff --git a/system/stack/gatt/gatt_attr.cc b/system/stack/gatt/gatt_attr.cc
index 64bb0b070f..c9f175170b 100644
--- a/system/stack/gatt/gatt_attr.cc
+++ b/system/stack/gatt/gatt_attr.cc
@@ -34,9 +34,6 @@
 #include "gatt_api.h"
 #include "gatt_int.h"
 #include "internal_include/bt_target.h"
-#include "internal_include/bt_trace.h"
-#include "os/log.h"
-#include "os/logging/log_adapter.h"
 #include "stack/include/bt_types.h"
 #include "stack/include/bt_uuid16.h"
 #include "stack/include/btm_sec_api.h"
@@ -365,7 +362,7 @@ static void gatt_request_cback(uint16_t conn_id, uint32_t trans_id,
  ******************************************************************************/
 static void gatt_connect_cback(tGATT_IF /* gatt_if */, const RawAddress& bda,
                                uint16_t conn_id, bool connected,
-                               tGATT_DISCONN_REASON reason,
+                               tGATT_DISCONN_REASON /* reason */,
                                tBT_TRANSPORT transport) {
   log::verbose("from {} connected: {}, conn_id: 0x{:x}", bda, connected,
                conn_id);
@@ -518,7 +515,8 @@ static void gatt_disc_res_cback(uint16_t conn_id, tGATT_DISC_TYPE disc_type,
  * Returns          void
  *
  ******************************************************************************/
-static void gatt_disc_cmpl_cback(uint16_t conn_id, tGATT_DISC_TYPE disc_type,
+static void gatt_disc_cmpl_cback(uint16_t conn_id,
+                                 tGATT_DISC_TYPE /* disc_type */,
                                  tGATT_STATUS status) {
   tGATT_PROFILE_CLCB* p_clcb = gatt_profile_find_clcb_by_conn_id(conn_id);
   if (p_clcb == NULL) {
@@ -560,8 +558,8 @@ static bool gatt_svc_read_cl_supp_feat_req(uint16_t conn_id) {
 
   gatt_op_cb_data cb_data;
 
-  cb_data.cb =
-      base::BindOnce([](const RawAddress& bdaddr, uint8_t support) { return; });
+  cb_data.cb = base::BindOnce(
+      [](const RawAddress& /* bdaddr */, uint8_t /* support */) { return; });
   cb_data.op_uuid = GATT_UUID_CLIENT_SUP_FEAT;
   OngoingOps[conn_id].emplace_back(std::move(cb_data));
 
@@ -624,8 +622,8 @@ static void gatt_cl_op_cmpl_cback(uint16_t conn_id, tGATTC_OPTYPE op,
       iter->second.pop_front();
       /* Read server supported features here supported */
       read_sr_supported_feat_req(
-          conn_id, base::BindOnce([](const RawAddress& bdaddr,
-                                     uint8_t support) { return; }));
+          conn_id, base::BindOnce([](const RawAddress& /* bdaddr */,
+                                     uint8_t /* support */) { return; }));
     } else {
       log::debug("Not interested in that write response");
     }
@@ -750,8 +748,8 @@ static void gatt_cl_start_config_ccc(tGATT_PROFILE_CLCB* p_clcb) {
       }
 
       gatt_op_cb_data cb_data;
-      cb_data.cb = base::BindOnce(
-          [](const RawAddress& bdaddr, uint8_t support) { return; });
+      cb_data.cb = base::BindOnce([](const RawAddress& /* bdaddr */,
+                                     uint8_t /* support */) { return; });
       cb_data.op_uuid = GATT_UUID_GATT_SRV_CHGD;
       OngoingOps[p_clcb->conn_id].emplace_back(std::move(cb_data));
 
@@ -769,8 +767,8 @@ static void gatt_cl_start_config_ccc(tGATT_PROFILE_CLCB* p_clcb) {
  * Returns          none
  *
  ******************************************************************************/
-void GATT_ConfigServiceChangeCCC(const RawAddress& remote_bda, bool enable,
-                                 tBT_TRANSPORT transport) {
+void GATT_ConfigServiceChangeCCC(const RawAddress& remote_bda,
+                                 bool /* enable */, tBT_TRANSPORT transport) {
   tGATT_PROFILE_CLCB* p_clcb =
       gatt_profile_find_clcb_by_bd_addr(remote_bda, transport);
 
diff --git a/system/stack/gatt/gatt_db.cc b/system/stack/gatt/gatt_db.cc
index b17f4c5c01..4f37650981 100644
--- a/system/stack/gatt/gatt_db.cc
+++ b/system/stack/gatt/gatt_db.cc
@@ -275,7 +275,7 @@ static tGATT_STATUS read_attr_value(tGATT_ATTR& attr16, uint16_t offset,
  ******************************************************************************/
 tGATT_STATUS gatts_db_read_attr_value_by_type(
     tGATT_TCB& tcb, uint16_t cid, tGATT_SVC_DB* p_db, uint8_t op_code,
-    BT_HDR* p_rsp, uint16_t s_handle, uint16_t e_handle, const Uuid& type,
+    BT_HDR* p_rsp, uint16_t s_handle, uint16_t /* e_handle */, const Uuid& type,
     uint16_t* p_len, tGATT_SEC_FLAG sec_flag, uint8_t key_size,
     uint32_t trans_id, uint16_t* p_cur_handle) {
   tGATT_STATUS status = GATT_NOT_FOUND;
diff --git a/system/stack/gatt/gatt_main.cc b/system/stack/gatt/gatt_main.cc
index 5bb62f637c..bf456d80fc 100644
--- a/system/stack/gatt/gatt_main.cc
+++ b/system/stack/gatt/gatt_main.cc
@@ -217,7 +217,7 @@ void gatt_free(void) {
  ******************************************************************************/
 bool gatt_connect(const RawAddress& rem_bda, tBLE_ADDR_TYPE addr_type,
                   tGATT_TCB* p_tcb, tBT_TRANSPORT transport,
-                  uint8_t initiating_phys, tGATT_IF gatt_if) {
+                  uint8_t /* initiating_phys */, tGATT_IF gatt_if) {
   if (gatt_get_ch_state(p_tcb) != GATT_CH_OPEN)
     gatt_set_ch_state(p_tcb, GATT_CH_CONN);
 
@@ -466,7 +466,7 @@ bool gatt_act_connect(tGATT_REG* p_reg, const RawAddress& bd_addr,
 }
 
 namespace connection_manager {
-void on_connection_timed_out(uint8_t app_id, const RawAddress& address) {
+void on_connection_timed_out(uint8_t /* app_id */, const RawAddress& address) {
   if (com::android::bluetooth::flags::enumerate_gatt_errors()) {
     gatt_le_connect_cback(L2CAP_ATT_CID, address, false, 0x08, BT_TRANSPORT_LE);
   } else {
@@ -478,9 +478,9 @@ void on_connection_timed_out(uint8_t app_id, const RawAddress& address) {
 /** This callback function is called by L2CAP to indicate that the ATT fixed
  * channel for LE is connected (conn = true)/disconnected (conn = false).
  */
-static void gatt_le_connect_cback(uint16_t chan, const RawAddress& bd_addr,
-                                  bool connected, uint16_t reason,
-                                  tBT_TRANSPORT transport) {
+static void gatt_le_connect_cback(uint16_t /* chan */,
+                                  const RawAddress& bd_addr, bool connected,
+                                  uint16_t reason, tBT_TRANSPORT transport) {
   tGATT_TCB* p_tcb = gatt_find_tcb_by_addr(bd_addr, transport);
   bool check_srv_chg = false;
   tGATTS_SRV_CHG* p_srv_chg_clt = NULL;
@@ -738,9 +738,8 @@ static void gatt_le_cong_cback(const RawAddress& remote_bda, bool congested) {
  * Returns          void
  *
  ******************************************************************************/
-static void gatt_le_data_ind(uint16_t chan, const RawAddress& bd_addr,
+static void gatt_le_data_ind(uint16_t /* chan */, const RawAddress& bd_addr,
                              BT_HDR* p_buf) {
-
   /* Find CCB based on bd addr */
   tGATT_TCB* p_tcb = gatt_find_tcb_by_addr(bd_addr, BT_TRANSPORT_LE);
   if (p_tcb) {
@@ -772,7 +771,7 @@ static void gatt_le_data_ind(uint16_t chan, const RawAddress& bd_addr,
  ******************************************************************************/
 static void gatt_l2cif_connect_ind_cback(const RawAddress& bd_addr,
                                          uint16_t lcid, uint16_t /* psm */,
-                                         uint8_t id) {
+                                         uint8_t /* id */) {
   uint8_t result = L2CAP_CONN_OK;
   log::info("Connection indication cid = {}", lcid);
 
@@ -804,7 +803,7 @@ static void gatt_l2cif_connect_ind_cback(const RawAddress& bd_addr,
   gatt_set_ch_state(p_tcb, GATT_CH_CFG);
 }
 
-static void gatt_on_l2cap_error(uint16_t lcid, uint16_t result) {
+static void gatt_on_l2cap_error(uint16_t lcid, uint16_t /* result */) {
   tGATT_TCB* p_tcb = gatt_find_tcb_by_cid(lcid);
   if (p_tcb == nullptr) return;
   if (gatt_get_ch_state(p_tcb) == GATT_CH_CONN) {
@@ -834,7 +833,7 @@ static void gatt_l2cif_connect_cfm_cback(uint16_t lcid, uint16_t result) {
 }
 
 /** This is the L2CAP config confirm callback function */
-void gatt_l2cif_config_cfm_cback(uint16_t lcid, uint16_t initiator,
+void gatt_l2cif_config_cfm_cback(uint16_t lcid, uint16_t /* initiator */,
                                  tL2CAP_CFG_INFO* p_cfg) {
   gatt_l2cif_config_ind_cback(lcid, p_cfg);
 
@@ -874,8 +873,7 @@ void gatt_l2cif_config_ind_cback(uint16_t lcid, tL2CAP_CFG_INFO* p_cfg) {
 }
 
 /** This is the L2CAP disconnect indication callback function */
-void gatt_l2cif_disconnect_ind_cback(uint16_t lcid, bool ack_needed) {
-
+void gatt_l2cif_disconnect_ind_cback(uint16_t lcid, bool /* ack_needed */) {
   /* look up clcb for this channel */
   tGATT_TCB* p_tcb = gatt_find_tcb_by_cid(lcid);
   if (!p_tcb) return;
diff --git a/system/stack/hcic/hciblecmds.cc b/system/stack/hcic/hciblecmds.cc
index f52232cc98..ea5ce1f61a 100644
--- a/system/stack/hcic/hciblecmds.cc
+++ b/system/stack/hcic/hciblecmds.cc
@@ -244,7 +244,7 @@ void btsnd_hcic_ble_rand(base::Callback<void(BT_OCTET8)> cb) {
   btu_hcif_send_cmd_with_cb(FROM_HERE, HCI_BLE_RAND, nullptr, 0,
                             base::Bind(
                                 [](base::Callback<void(BT_OCTET8)> cb,
-                                   uint8_t* param, uint16_t param_len) {
+                                   uint8_t* param, uint16_t /* param_len */) {
                                   bluetooth::log::assert_that(
                                       param[0] == 0,
                                       "LE Rand return status must be zero");
diff --git a/system/stack/hcic/hcicmds.cc b/system/stack/hcic/hcicmds.cc
index 26df7a5f7f..36035f1067 100644
--- a/system/stack/hcic/hcicmds.cc
+++ b/system/stack/hcic/hcicmds.cc
@@ -1485,8 +1485,9 @@ void btsnd_hcic_read_rssi(uint16_t handle) {
   btu_hcif_send_cmd(LOCAL_BR_EDR_CONTROLLER_ID, p);
 }
 
-static void read_encryption_key_size_complete(ReadEncKeySizeCb cb, uint8_t* return_parameters,
-                                              uint16_t return_parameters_length) {
+static void read_encryption_key_size_complete(
+    ReadEncKeySizeCb cb, uint8_t* return_parameters,
+    uint16_t /* return_parameters_length */) {
   uint8_t status;
   uint16_t handle;
   uint8_t key_size;
diff --git a/system/stack/l2cap/l2c_api.cc b/system/stack/l2cap/l2c_api.cc
index fed26ece5b..b7408ad3ac 100644
--- a/system/stack/l2cap/l2c_api.cc
+++ b/system/stack/l2cap/l2c_api.cc
@@ -116,7 +116,7 @@ static const bool enforce_assert = check_l2cap_credit();
 uint16_t L2CA_Register(uint16_t psm, const tL2CAP_APPL_INFO& p_cb_info,
                        bool enable_snoop, tL2CAP_ERTM_INFO* p_ertm_info,
                        uint16_t my_mtu, uint16_t required_remote_mtu,
-                       uint16_t sec_level) {
+                       uint16_t /* sec_level */) {
   const bool config_cfm_cb = (p_cb_info.pL2CA_ConfigCfm_Cb != nullptr);
   const bool config_ind_cb = (p_cb_info.pL2CA_ConfigInd_Cb != nullptr);
   const bool data_ind_cb = (p_cb_info.pL2CA_DataInd_Cb != nullptr);
@@ -842,7 +842,7 @@ std::vector<uint16_t> L2CA_ConnectCreditBasedReq(uint16_t psm,
  *
  ******************************************************************************/
 
-bool L2CA_ReconfigCreditBasedConnsReq(const RawAddress& bda,
+bool L2CA_ReconfigCreditBasedConnsReq(const RawAddress& /* bda */,
                                       std::vector<uint16_t>& lcids,
                                       tL2CAP_LE_CFG_INFO* p_cfg) {
   tL2C_CCB* p_ccb;
diff --git a/system/stack/l2cap/l2c_ble.cc b/system/stack/l2cap/l2c_ble.cc
index b14752e479..d41c740394 100644
--- a/system/stack/l2cap/l2c_ble.cc
+++ b/system/stack/l2cap/l2c_ble.cc
@@ -122,7 +122,7 @@ void l2cble_notify_le_connection(const RawAddress& bda) {
 /** This function is called when an HCI Connection Complete event is received.
  */
 bool l2cble_conn_comp(uint16_t handle, uint8_t role, const RawAddress& bda,
-                      tBLE_ADDR_TYPE type, uint16_t conn_interval,
+                      tBLE_ADDR_TYPE /* type */, uint16_t conn_interval,
                       uint16_t conn_latency, uint16_t conn_timeout) {
   // role == HCI_ROLE_CENTRAL => scanner completed connection
   // role == HCI_ROLE_PERIPHERAL => advertiser completed connection
@@ -1111,7 +1111,7 @@ static bool is_legal_tx_data_len(const uint16_t& tx_data_len) {
 
 void l2cble_process_data_length_change_event(uint16_t handle,
                                              uint16_t tx_data_len,
-                                             uint16_t rx_data_len) {
+                                             uint16_t /* rx_data_len */) {
   tL2C_LCB* p_lcb = l2cu_find_lcb_by_handle(handle);
   if (p_lcb == nullptr) {
     log::warn(
@@ -1249,7 +1249,7 @@ void l2cble_send_peer_disc_req(tL2C_CCB* p_ccb) {
  *
  ******************************************************************************/
 void l2cble_sec_comp(const RawAddress* bda, tBT_TRANSPORT transport,
-                     void* p_ref_data, tBTM_STATUS status) {
+                     void* /* p_ref_data */, tBTM_STATUS status) {
   const RawAddress& p_bda = *bda;
   tL2C_LCB* p_lcb = l2cu_find_lcb_by_bd_addr(p_bda, BT_TRANSPORT_LE);
   tL2CAP_SEC_DATA* p_buf = NULL;
diff --git a/system/stack/l2cap/l2c_ble_conn_params.cc b/system/stack/l2cap/l2c_ble_conn_params.cc
index 2aec0435ab..1a791f68d4 100644
--- a/system/stack/l2cap/l2c_ble_conn_params.cc
+++ b/system/stack/l2cap/l2c_ble_conn_params.cc
@@ -31,7 +31,6 @@
 #include "internal_include/stack_config.h"
 #include "main/shim/acl_api.h"
 #include "main/shim/entry.h"
-#include "os/log.h"
 #include "stack/btm/btm_dev.h"
 #include "stack/include/acl_api.h"
 #include "stack/include/btm_ble_api_types.h"
@@ -285,8 +284,9 @@ void l2cble_start_conn_update(tL2C_LCB* p_lcb) {
  *
  ******************************************************************************/
 void l2cble_process_conn_update_evt(uint16_t handle, uint8_t status,
-                                    uint16_t interval, uint16_t latency,
-                                    uint16_t timeout) {
+                                    uint16_t /* interval */,
+                                    uint16_t /* latency */,
+                                    uint16_t /* timeout */) {
   log::verbose("");
 
   /* See if we have a link control block for the remote device */
@@ -501,9 +501,10 @@ bool L2CA_SubrateRequest(const RawAddress& rem_bda, uint16_t subrate_min,
  *
  ******************************************************************************/
 void l2cble_process_subrate_change_evt(uint16_t handle, uint8_t status,
-                                       uint16_t subrate_factor,
-                                       uint16_t peripheral_latency,
-                                       uint16_t cont_num, uint16_t timeout) {
+                                       uint16_t /* subrate_factor */,
+                                       uint16_t /* peripheral_latency */,
+                                       uint16_t /* cont_num */,
+                                       uint16_t /* timeout */) {
   log::verbose("");
 
   /* See if we have a link control block for the remote device */
diff --git a/system/stack/rfcomm/rfc_mx_fsm.cc b/system/stack/rfcomm/rfc_mx_fsm.cc
index ddf84b8797..71ae56f9ac 100644
--- a/system/stack/rfcomm/rfc_mx_fsm.cc
+++ b/system/stack/rfcomm/rfc_mx_fsm.cc
@@ -123,7 +123,8 @@ void rfc_mx_sm_execute(tRFC_MCB* p_mcb, tRFC_MX_EVENT event, void* p_data) {
  * Returns          void
  *
  ******************************************************************************/
-void rfc_mx_sm_state_idle(tRFC_MCB* p_mcb, tRFC_MX_EVENT event, void* p_data) {
+void rfc_mx_sm_state_idle(tRFC_MCB* p_mcb, tRFC_MX_EVENT event,
+                          void* /* p_data */) {
   switch (event) {
     case RFC_MX_EVENT_START_REQ: {
       /* Initialize L2CAP MTU */
@@ -646,7 +647,7 @@ void rfc_on_l2cap_error(uint16_t lcid, uint16_t result) {
  *                  on DLCI 0.  T1 is still running.
  *
  ******************************************************************************/
-static void rfc_mx_conf_cnf(tRFC_MCB* p_mcb, uint16_t result) {
+static void rfc_mx_conf_cnf(tRFC_MCB* p_mcb, uint16_t /* result */) {
   if (p_mcb->state == RFC_MX_STATE_CONFIGURE) {
     if (p_mcb->is_initiator) {
       p_mcb->state = RFC_MX_STATE_SABME_WAIT_UA;
diff --git a/system/stack/smp/smp_act.cc b/system/stack/smp/smp_act.cc
index b926862cdb..3de985dfaa 100644
--- a/system/stack/smp/smp_act.cc
+++ b/system/stack/smp/smp_act.cc
@@ -29,7 +29,6 @@
 #include "crypto_toolbox/crypto_toolbox.h"
 #include "device/include/interop.h"
 #include "internal_include/bt_target.h"
-#include "os/log.h"
 #include "p_256_ecc_pp.h"
 #include "smp_int.h"
 #include "stack/btm/btm_ble_sec.h"
@@ -287,7 +286,7 @@ void smp_send_pair_fail(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) {
  * Function     smp_send_pair_req
  * Description  actions related to sending pairing request
  ******************************************************************************/
-void smp_send_pair_req(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) {
+void smp_send_pair_req(tSMP_CB* p_cb, tSMP_INT_DATA* /* p_data */) {
   tBTM_SEC_DEV_REC* p_dev_rec = btm_find_dev(p_cb->pairing_bda);
   log::verbose("addr:{}", p_cb->pairing_bda);
 
@@ -302,7 +301,7 @@ void smp_send_pair_req(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) {
  * Function     smp_send_pair_rsp
  * Description  actions related to sending pairing response
  ******************************************************************************/
-void smp_send_pair_rsp(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) {
+void smp_send_pair_rsp(tSMP_CB* p_cb, tSMP_INT_DATA* /* p_data */) {
   log::verbose("addr:{}", p_cb->pairing_bda);
 
   p_cb->local_i_key &= p_cb->peer_i_key;
@@ -320,7 +319,7 @@ void smp_send_pair_rsp(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) {
  * Function     smp_send_confirm
  * Description  send confirmation to the peer
  ******************************************************************************/
-void smp_send_confirm(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) {
+void smp_send_confirm(tSMP_CB* p_cb, tSMP_INT_DATA* /* p_data */) {
   log::verbose("addr:{}", p_cb->pairing_bda);
   smp_send_cmd(SMP_OPCODE_CONFIRM, p_cb);
   p_cb->flags |= SMP_PAIR_FLAGS_CMD_CONFIRM_SENT;
@@ -330,7 +329,7 @@ void smp_send_confirm(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) {
  * Function     smp_send_rand
  * Description  send pairing random to the peer
  ******************************************************************************/
-void smp_send_rand(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) {
+void smp_send_rand(tSMP_CB* p_cb, tSMP_INT_DATA* /* p_data */) {
   log::verbose("addr:{}", p_cb->pairing_bda);
   smp_send_cmd(SMP_OPCODE_RAND, p_cb);
 }
@@ -339,7 +338,7 @@ void smp_send_rand(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) {
  * Function     smp_send_pair_public_key
  * Description  send pairing public key command to the peer
  ******************************************************************************/
-void smp_send_pair_public_key(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) {
+void smp_send_pair_public_key(tSMP_CB* p_cb, tSMP_INT_DATA* /* p_data */) {
   log::verbose("addr:{}", p_cb->pairing_bda);
   smp_send_cmd(SMP_OPCODE_PAIR_PUBLIC_KEY, p_cb);
 }
@@ -348,7 +347,7 @@ void smp_send_pair_public_key(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) {
  * Function     SMP_SEND_COMMITMENT
  * Description send commitment command to the peer
  ******************************************************************************/
-void smp_send_commitment(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) {
+void smp_send_commitment(tSMP_CB* p_cb, tSMP_INT_DATA* /* p_data */) {
   log::verbose("addr:{}", p_cb->pairing_bda);
   smp_send_cmd(SMP_OPCODE_PAIR_COMMITM, p_cb);
 }
@@ -357,7 +356,7 @@ void smp_send_commitment(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) {
  * Function     smp_send_dhkey_check
  * Description send DHKey Check command to the peer
  ******************************************************************************/
-void smp_send_dhkey_check(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) {
+void smp_send_dhkey_check(tSMP_CB* p_cb, tSMP_INT_DATA* /* p_data */) {
   log::verbose("addr:{}", p_cb->pairing_bda);
   smp_send_cmd(SMP_OPCODE_PAIR_DHKEY_CHECK, p_cb);
 }
@@ -375,7 +374,7 @@ void smp_send_keypress_notification(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) {
  * Function     smp_send_enc_info
  * Description  send encryption information command.
  ******************************************************************************/
-void smp_send_enc_info(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) {
+void smp_send_enc_info(tSMP_CB* p_cb, tSMP_INT_DATA* /* p_data */) {
   log::verbose("p_cb->loc_enc_size={}", p_cb->loc_enc_size);
   smp_update_key_mask(p_cb, SMP_SEC_KEY_TYPE_ENC, false);
 
@@ -403,7 +402,7 @@ void smp_send_enc_info(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) {
  * Function     smp_send_id_info
  * Description  send ID information command.
  ******************************************************************************/
-void smp_send_id_info(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) {
+void smp_send_id_info(tSMP_CB* p_cb, tSMP_INT_DATA* /* p_data */) {
   log::verbose("addr:{}", p_cb->pairing_bda);
   smp_update_key_mask(p_cb, SMP_SEC_KEY_TYPE_ID, false);
 
@@ -418,7 +417,7 @@ void smp_send_id_info(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) {
 }
 
 /**  send CSRK command. */
-void smp_send_csrk_info(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) {
+void smp_send_csrk_info(tSMP_CB* p_cb, tSMP_INT_DATA* /* p_data */) {
   log::verbose("addr:{}", p_cb->pairing_bda);
   smp_update_key_mask(p_cb, SMP_SEC_KEY_TYPE_CSRK, false);
 
@@ -913,7 +912,8 @@ void smp_br_process_security_grant(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) {
  * Description  sets the SMP kes to be derived/distribute over BR/EDR transport
  *              before starting the distribution/derivation
  ******************************************************************************/
-void smp_br_check_authorization_request(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) {
+void smp_br_check_authorization_request(tSMP_CB* p_cb,
+                                        tSMP_INT_DATA* /* p_data */) {
   log::verbose("rcvs i_keys=0x{:x} r_keys=0x{:x} (i-initiator r-responder)",
                p_cb->local_i_key, p_cb->local_r_key);
 
@@ -1192,7 +1192,7 @@ void smp_start_enc(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) {
  * Function     smp_proc_discard
  * Description   processing for discard security request
  ******************************************************************************/
-void smp_proc_discard(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) {
+void smp_proc_discard(tSMP_CB* p_cb, tSMP_INT_DATA* /* p_data */) {
   log::verbose("addr:{}", p_cb->pairing_bda);
   if (!(p_cb->flags & SMP_PAIR_FLAGS_WE_STARTED_DD))
     smp_reset_control_value(p_cb);
@@ -1395,7 +1395,7 @@ void smp_key_distribution(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) {
  *                  STK generation and to start STK generation process.
  *
  ******************************************************************************/
-void smp_decide_association_model(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) {
+void smp_decide_association_model(tSMP_CB* p_cb, tSMP_INT_DATA* /* p_data */) {
   tSMP_EVENT int_evt = SMP_NOP_EVT;
   tSMP_INT_DATA smp_int_data;
 
@@ -1491,7 +1491,7 @@ void smp_decide_association_model(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) {
  * Function     smp_process_io_response
  * Description  process IO response for a peripheral device.
  ******************************************************************************/
-void smp_process_io_response(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) {
+void smp_process_io_response(tSMP_CB* p_cb, tSMP_INT_DATA* /* p_data */) {
   log::verbose("addr:{}", p_cb->pairing_bda);
   if (p_cb->flags & SMP_PAIR_FLAGS_WE_STARTED_DD) {
     /* pairing started by local (peripheral) Security Request */
@@ -1565,7 +1565,7 @@ void smp_process_io_response(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) {
  *              (BR/EDR transport).
  ******************************************************************************/
 void smp_br_process_peripheral_keys_response(tSMP_CB* p_cb,
-                                             tSMP_INT_DATA* p_data) {
+                                             tSMP_INT_DATA* /* p_data */) {
   smp_br_send_pair_response(p_cb, NULL);
 }
 
@@ -1574,7 +1574,7 @@ void smp_br_process_peripheral_keys_response(tSMP_CB* p_cb,
  * Description  actions related to sending pairing response over BR/EDR
  *              transport.
  ******************************************************************************/
-void smp_br_send_pair_response(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) {
+void smp_br_send_pair_response(tSMP_CB* p_cb, tSMP_INT_DATA* /* p_data */) {
   log::verbose("addr:{}", p_cb->pairing_bda);
 
   p_cb->local_i_key &= p_cb->peer_i_key;
@@ -1588,7 +1588,7 @@ void smp_br_send_pair_response(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) {
  * Description      This function is called to send the pairing complete
  *                  callback and remove the connection if needed.
  ******************************************************************************/
-void smp_pairing_cmpl(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) {
+void smp_pairing_cmpl(tSMP_CB* p_cb, tSMP_INT_DATA* /* p_data */) {
   if (p_cb->total_tx_unacked == 0) {
     /* process the pairing complete */
     smp_proc_pairing_cmpl(p_cb);
@@ -1600,7 +1600,7 @@ void smp_pairing_cmpl(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) {
  * Description      This function is called to send the pairing complete
  *                  callback and remove the connection if needed.
  ******************************************************************************/
-void smp_pair_terminate(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) {
+void smp_pair_terminate(tSMP_CB* p_cb, tSMP_INT_DATA* /* p_data */) {
   log::verbose("addr:{}", p_cb->pairing_bda);
   p_cb->status = SMP_CONN_TOUT;
   smp_proc_pairing_cmpl(p_cb);
@@ -1611,7 +1611,7 @@ void smp_pair_terminate(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) {
  * Description      This function calledin idle state to determine to send
  *                  authentication complete or not.
  ******************************************************************************/
-void smp_idle_terminate(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) {
+void smp_idle_terminate(tSMP_CB* p_cb, tSMP_INT_DATA* /* p_data */) {
   if (p_cb->flags & SMP_PAIR_FLAGS_WE_STARTED_DD) {
     log::verbose("Pairing terminated at IDLE state.");
     p_cb->status = SMP_FAIL;
@@ -1629,7 +1629,7 @@ void smp_idle_terminate(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) {
  *peer.
  *              - invokes SC phase 1 process.
  ******************************************************************************/
-void smp_both_have_public_keys(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) {
+void smp_both_have_public_keys(tSMP_CB* p_cb, tSMP_INT_DATA* /* p_data */) {
   log::verbose("addr:{}", p_cb->pairing_bda);
 
   /* invokes DHKey computation */
@@ -1648,7 +1648,8 @@ void smp_both_have_public_keys(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) {
  *              to the peer messages appropriate for the role and association
  *              model.
  ******************************************************************************/
-void smp_start_secure_connection_phase1(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) {
+void smp_start_secure_connection_phase1(tSMP_CB* p_cb,
+                                        tSMP_INT_DATA* /* p_data */) {
   log::verbose("addr:{}", p_cb->pairing_bda);
 
   if (p_cb->selected_association_model == SMP_MODEL_SEC_CONN_JUSTWORKS) {
@@ -1693,7 +1694,7 @@ void smp_start_secure_connection_phase1(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) {
  *
  * Note         It is supposed to be called in SC phase1.
  ******************************************************************************/
-void smp_process_local_nonce(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) {
+void smp_process_local_nonce(tSMP_CB* p_cb, tSMP_INT_DATA* /* p_data */) {
   log::verbose("addr:{}", p_cb->pairing_bda);
 
   switch (p_cb->selected_association_model) {
@@ -1757,7 +1758,7 @@ void smp_process_local_nonce(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) {
  *
  * Note         It is supposed to be called in SC phase1.
  ******************************************************************************/
-void smp_process_peer_nonce(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) {
+void smp_process_peer_nonce(tSMP_CB* p_cb, tSMP_INT_DATA* /* p_data */) {
   log::verbose("addr:{}, selected_association_model:{}", p_cb->pairing_bda,
                p_cb->selected_association_model);
 
@@ -1897,7 +1898,7 @@ void smp_match_dhkey_checks(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) {
  * Note         SM is supposed to be in the state SMP_STATE_SEC_CONN_PHS2_START.
  ******************************************************************************/
 void smp_move_to_secure_connections_phase2(tSMP_CB* p_cb,
-                                           tSMP_INT_DATA* p_data) {
+                                           tSMP_INT_DATA* /* p_data */) {
   log::verbose("addr:{}", p_cb->pairing_bda);
   smp_sm_event(p_cb, SMP_SC_PHASE1_CMPLT_EVT, NULL);
 }
@@ -1912,7 +1913,7 @@ void smp_move_to_secure_connections_phase2(tSMP_CB* p_cb,
  *              calculated.
  ******************************************************************************/
 void smp_phase_2_dhkey_checks_are_present(tSMP_CB* p_cb,
-                                          tSMP_INT_DATA* p_data) {
+                                          tSMP_INT_DATA* /* p_data */) {
   log::verbose("addr:{}", p_cb->pairing_bda);
 
   if (p_cb->flags & SMP_PAIR_FLAG_HAVE_PEER_DHK_CHK)
@@ -1927,7 +1928,7 @@ void smp_phase_2_dhkey_checks_are_present(tSMP_CB* p_cb,
  * Note         on the peripheral it is used to prevent race condition.
  *
  ******************************************************************************/
-void smp_wait_for_both_public_keys(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) {
+void smp_wait_for_both_public_keys(tSMP_CB* p_cb, tSMP_INT_DATA* /* p_data */) {
   log::verbose("addr:{}", p_cb->pairing_bda);
 
   if ((p_cb->flags & SMP_PAIR_FLAG_HAVE_PEER_PUBL_KEY) &&
@@ -1964,7 +1965,7 @@ void smp_start_passkey_verification(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) {
  * Description  Processes local/peer SC OOB data received from somewhere.
  ******************************************************************************/
 void smp_process_secure_connection_oob_data(tSMP_CB* p_cb,
-                                            tSMP_INT_DATA* p_data) {
+                                            tSMP_INT_DATA* /* p_data */) {
   log::verbose("addr:{}", p_cb->pairing_bda);
 
   tSMP_SC_OOB_DATA* p_sc_oob_data = &p_cb->sc_oob_data;
@@ -2010,7 +2011,7 @@ void smp_process_secure_connection_oob_data(tSMP_CB* p_cb,
  *              sc_oob_data.loc_oob_data, starts nonce generation
  *              (to be saved in sc_oob_data.loc_oob_data.randomizer).
  ******************************************************************************/
-void smp_set_local_oob_keys(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) {
+void smp_set_local_oob_keys(tSMP_CB* p_cb, tSMP_INT_DATA* /* p_data */) {
   log::verbose("addr:{}", p_cb->pairing_bda);
 
   memcpy(p_cb->sc_oob_data.loc_oob_data.private_key_used, p_cb->private_key,
@@ -2025,7 +2026,8 @@ void smp_set_local_oob_keys(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) {
  *              sc_oob_data.loc_oob_data, passes sc_oob_data.loc_oob_data up
  *              for safekeeping.
  ******************************************************************************/
-void smp_set_local_oob_random_commitment(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) {
+void smp_set_local_oob_random_commitment(tSMP_CB* p_cb,
+                                         tSMP_INT_DATA* /* p_data */) {
   log::verbose("{}", p_cb->pairing_bda);
   p_cb->sc_oob_data.loc_oob_data.randomizer = p_cb->rand;
 
@@ -2159,7 +2161,7 @@ void smp_process_secure_connection_long_term_key(void) {
  * Returns          void
  *
  ******************************************************************************/
-void smp_set_derive_link_key(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) {
+void smp_set_derive_link_key(tSMP_CB* p_cb, tSMP_INT_DATA* /* p_data */) {
   log::verbose("addr:{}", p_cb->pairing_bda);
   p_cb->derive_lk = true;
   smp_update_key_mask(p_cb, SMP_SEC_KEY_TYPE_LK, false);
@@ -2176,7 +2178,7 @@ void smp_set_derive_link_key(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) {
  *
  ******************************************************************************/
 void smp_derive_link_key_from_long_term_key(tSMP_CB* p_cb,
-                                            tSMP_INT_DATA* p_data) {
+                                            tSMP_INT_DATA* /* p_data */) {
   tSMP_STATUS status = SMP_PAIR_FAIL_UNKNOWN;
 
   log::verbose("addr:{}", p_cb->pairing_bda);
@@ -2200,7 +2202,7 @@ void smp_derive_link_key_from_long_term_key(tSMP_CB* p_cb,
  * Returns          void
  *
  ******************************************************************************/
-void smp_br_process_link_key(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) {
+void smp_br_process_link_key(tSMP_CB* p_cb, tSMP_INT_DATA* /* p_data */) {
   tSMP_STATUS status = SMP_PAIR_FAIL_UNKNOWN;
 
   log::verbose("addr:{}", p_cb->pairing_bda);
@@ -2232,7 +2234,7 @@ void smp_br_process_link_key(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) {
  *              smp_key_distribution(...) or smp_br_key_distribution(...).
  ******************************************************************************/
 static void smp_key_distribution_by_transport(tSMP_CB* p_cb,
-                                              tSMP_INT_DATA* p_data) {
+                                              tSMP_INT_DATA* /* p_data */) {
   log::verbose("addr:{}", p_cb->pairing_bda);
   if (p_cb->smp_over_br) {
     smp_br_select_next_key(p_cb, NULL);
@@ -2246,7 +2248,7 @@ static void smp_key_distribution_by_transport(tSMP_CB* p_cb,
  * Description      This function is called to send the pairing complete
  *                  callback and remove the connection if needed.
  ******************************************************************************/
-void smp_br_pairing_complete(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) {
+void smp_br_pairing_complete(tSMP_CB* p_cb, tSMP_INT_DATA* /* p_data */) {
   log::verbose("addr:{}", p_cb->pairing_bda);
 
   if (p_cb->total_tx_unacked == 0) {
diff --git a/system/stack/smp/smp_api.cc b/system/stack/smp/smp_api.cc
index 83d2f6e147..c1fe32344e 100644
--- a/system/stack/smp/smp_api.cc
+++ b/system/stack/smp/smp_api.cc
@@ -364,8 +364,8 @@ void SMP_ConfirmReply(const RawAddress& bd_addr, uint8_t res) {
  *                  p_data      - simple pairing Randomizer  C.
  *
  ******************************************************************************/
-void SMP_OobDataReply(const RawAddress& bd_addr, tSMP_STATUS res, uint8_t len,
-                      uint8_t* p_data) {
+void SMP_OobDataReply(const RawAddress& /* bd_addr */, tSMP_STATUS res,
+                      uint8_t len, uint8_t* p_data) {
   tSMP_CB* p_cb = &smp_cb;
   tSMP_KEY key;
 
diff --git a/system/stack/smp/smp_keys.cc b/system/stack/smp/smp_keys.cc
index 49c76cb27c..619ff13f1c 100644
--- a/system/stack/smp/smp_keys.cc
+++ b/system/stack/smp/smp_keys.cc
@@ -34,8 +34,6 @@
 #include "crypto_toolbox/crypto_toolbox.h"
 #include "hci/controller_interface.h"
 #include "main/shim/entry.h"
-#include "os/log.h"
-#include "osi/include/osi.h"
 #include "p_256_ecc_pp.h"
 #include "smp_int.h"
 #include "stack/btm/btm_ble_sec.h"
@@ -85,8 +83,9 @@ bool smp_has_local_oob_data() {
   return !is_oob_data_empty(&saved_local_oob_data);
 }
 
-void smp_debug_print_nbyte_little_endian(uint8_t* p, const char* key_name,
-                                         uint8_t len) {}
+void smp_debug_print_nbyte_little_endian(uint8_t* /* p */,
+                                         const char* /* key_name */,
+                                         uint8_t /* len */) {}
 
 inline void smp_debug_print_nbyte_little_endian(const Octet16& p,
                                                 const char* key_name,
@@ -95,8 +94,9 @@ inline void smp_debug_print_nbyte_little_endian(const Octet16& p,
                                       len);
 }
 
-void smp_debug_print_nbyte_big_endian(uint8_t* p, const char* key_name,
-                                      uint8_t len) {}
+void smp_debug_print_nbyte_big_endian(uint8_t* /* p */,
+                                      const char* /* key_name */,
+                                      uint8_t /* len */) {}
 
 /** This function is called to process a passkey. */
 void smp_proc_passkey(tSMP_CB* p_cb, uint64_t rand) {
@@ -600,7 +600,7 @@ Octet16 smp_calculate_legacy_short_term_key(tSMP_CB* p_cb) {
  * Returns          void
  *
  ******************************************************************************/
-void smp_create_private_key(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) {
+void smp_create_private_key(tSMP_CB* p_cb, tSMP_INT_DATA* /* p_data */) {
   log::verbose("addr:{}", p_cb->pairing_bda);
 
   // Only use the stored OOB data if we are in an oob association model
@@ -666,7 +666,7 @@ void smp_create_private_key(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) {
  * Returns          void
  *
  ******************************************************************************/
-void smp_use_oob_private_key(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) {
+void smp_use_oob_private_key(tSMP_CB* p_cb, tSMP_INT_DATA* /* p_data */) {
   log::info("req_oob_type:{}, role:{}", p_cb->req_oob_type, p_cb->role);
 
   switch (p_cb->req_oob_type) {
@@ -860,8 +860,8 @@ Octet16 smp_calculate_peer_commitment(tSMP_CB* p_cb) {
  * Returns          void
  *
  ******************************************************************************/
-void smp_calculate_numeric_comparison_display_number(tSMP_CB* p_cb,
-                                                     tSMP_INT_DATA* p_data) {
+void smp_calculate_numeric_comparison_display_number(
+    tSMP_CB* p_cb, tSMP_INT_DATA* /* p_data */) {
   log::verbose("addr:{}", p_cb->pairing_bda);
 
   if (p_cb->role == HCI_ROLE_CENTRAL) {
@@ -902,7 +902,8 @@ void smp_calculate_numeric_comparison_display_number(tSMP_CB* p_cb,
  * Returns          void
  *
  ******************************************************************************/
-void smp_calculate_local_dhkey_check(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) {
+void smp_calculate_local_dhkey_check(tSMP_CB* p_cb,
+                                     tSMP_INT_DATA* /* p_data */) {
   uint8_t iocap[3], a[7], b[7];
 
   log::verbose("addr:{}", p_cb->pairing_bda);
@@ -926,7 +927,8 @@ void smp_calculate_local_dhkey_check(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) {
  * Returns          void
  *
  ******************************************************************************/
-void smp_calculate_peer_dhkey_check(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) {
+void smp_calculate_peer_dhkey_check(tSMP_CB* p_cb,
+                                    tSMP_INT_DATA* /* p_data */) {
   uint8_t iocap[3], a[7], b[7];
   tSMP_KEY key;
 
diff --git a/system/stack/smp/smp_l2c.cc b/system/stack/smp/smp_l2c.cc
index 04a0755cca..521cd15f64 100644
--- a/system/stack/smp/smp_l2c.cc
+++ b/system/stack/smp/smp_l2c.cc
@@ -266,8 +266,9 @@ static void smp_tx_complete_callback(uint16_t cid, uint16_t num_pkt) {
  *                      connected (conn = true)/disconnected (conn = false).
  *
  ******************************************************************************/
-static void smp_br_connect_callback(uint16_t channel, const RawAddress& bd_addr,
-                                    bool connected, uint16_t reason,
+static void smp_br_connect_callback(uint16_t /* channel */,
+                                    const RawAddress& bd_addr, bool connected,
+                                    uint16_t /* reason */,
                                     tBT_TRANSPORT transport) {
   tSMP_CB* p_cb = &smp_cb;
   tSMP_INT_DATA int_data;
@@ -332,8 +333,8 @@ static void smp_br_connect_callback(uint16_t channel, const RawAddress& bd_addr,
  * Returns          void
  *
  ******************************************************************************/
-static void smp_br_data_received(uint16_t channel, const RawAddress& bd_addr,
-                                 BT_HDR* p_buf) {
+static void smp_br_data_received(uint16_t /* channel */,
+                                 const RawAddress& bd_addr, BT_HDR* p_buf) {
   tSMP_CB* p_cb = &smp_cb;
   uint8_t* p = (uint8_t*)(p_buf + 1) + p_buf->offset;
   uint8_t cmd;
diff --git a/system/stack/srvc/srvc_eng.cc b/system/stack/srvc/srvc_eng.cc
index dbf30ff8b1..b6aaa3e015 100644
--- a/system/stack/srvc/srvc_eng.cc
+++ b/system/stack/srvc/srvc_eng.cc
@@ -207,7 +207,7 @@ static uint8_t srvc_eng_process_read_req(uint8_t clcb_idx,
 /*******************************************************************************
  *   Service Engine Server Attributes Database write Request process
  ******************************************************************************/
-static uint8_t srvc_eng_process_write_req(uint8_t clcb_idx,
+static uint8_t srvc_eng_process_write_req(uint8_t /* clcb_idx */,
                                           tGATT_WRITE_REQ* p_data,
                                           tGATTS_RSP* /* p_rsp */,
                                           tGATT_STATUS* p_status) {
@@ -321,7 +321,8 @@ static void srvc_eng_c_cmpl_cback(uint16_t conn_id, tGATTC_OPTYPE op,
  ******************************************************************************/
 static void srvc_eng_connect_cback(tGATT_IF /* gatt_if */,
                                    const RawAddress& bda, uint16_t conn_id,
-                                   bool connected, tGATT_DISCONN_REASON reason,
+                                   bool connected,
+                                   tGATT_DISCONN_REASON /* reason */,
                                    tBT_TRANSPORT /* transport */) {
   log::verbose("from {} connected:{} conn_id={}", bda, connected, conn_id);