From: Zach Johnson <zachoverflow@google.com>
Date: Sun, 16 Aug 2020 18:06:45 +0000 (-0700)
Subject: Remove unused pram from bta_dm_search_cancel
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=afcbfc4ab11224c4bf0fcbf770655086824e040d;p=android-x86%2Fsystem-bt.git

Remove unused pram from bta_dm_search_cancel

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I5bf0c9e20ac774e0d6e1bc7e453ac53216d2ed9e
---

diff --git a/bta/dm/bta_dm_act.cc b/bta/dm/bta_dm_act.cc
index 60aed8de2..e95322e43 100644
--- a/bta/dm/bta_dm_act.cc
+++ b/bta/dm/bta_dm_act.cc
@@ -854,7 +854,7 @@ void bta_dm_search_start(tBTA_DM_MSG* p_data) {
  * Returns          void
  *
  ******************************************************************************/
-void bta_dm_search_cancel(UNUSED_ATTR tBTA_DM_MSG* p_data) {
+void bta_dm_search_cancel() {
   tBTA_DM_MSG* p_msg;
 
   if (BTM_IsInquiryActive()) {
@@ -989,7 +989,7 @@ static void bta_dm_di_disc_callback(uint16_t result) {
 static void bta_dm_disable_search_and_disc(void) {
   tBTA_DM_DI_DISC_CMPL di_disc;
 
-  if (bta_dm_search_cb.state != BTA_DM_SEARCH_IDLE) bta_dm_search_cancel(NULL);
+  if (bta_dm_search_cb.state != BTA_DM_SEARCH_IDLE) bta_dm_search_cancel();
 
   if (bta_dm_di_cb.p_di_db != NULL) {
     memset(&di_disc, 0, sizeof(tBTA_DM_DI_DISC_CMPL));
diff --git a/bta/dm/bta_dm_int.h b/bta/dm/bta_dm_int.h
index a589eec90..ee354f4f1 100644
--- a/bta/dm/bta_dm_int.h
+++ b/bta/dm/bta_dm_int.h
@@ -509,7 +509,7 @@ extern void bta_dm_disable_pm(void);
 
 extern uint8_t bta_dm_get_av_count(void);
 extern void bta_dm_search_start(tBTA_DM_MSG* p_data);
-extern void bta_dm_search_cancel(tBTA_DM_MSG* p_data);
+extern void bta_dm_search_cancel();
 extern void bta_dm_discover(tBTA_DM_MSG* p_data);
 extern void bta_dm_di_disc(tBTA_DM_MSG* p_data);
 extern void bta_dm_inq_cmpl(uint8_t num);
diff --git a/bta/dm/bta_dm_main.cc b/bta/dm/bta_dm_main.cc
index 2bd357142..f272f588b 100644
--- a/bta/dm/bta_dm_main.cc
+++ b/bta/dm/bta_dm_main.cc
@@ -94,7 +94,7 @@ bool bta_dm_search_sm_execute(BT_HDR* p_msg) {
       switch (p_msg->event) {
         case BTA_DM_API_SEARCH_CANCEL_EVT:
           bta_dm_search_set_state(BTA_DM_SEARCH_CANCELLING);
-          bta_dm_search_cancel(message);
+          bta_dm_search_cancel();
           break;
         case BTA_DM_REMT_NAME_EVT:
           bta_dm_rmt_name(message);