From: Zach Johnson Date: Sat, 29 Aug 2020 17:16:50 +0000 (-0700) Subject: Remove unused parameter from bta_hd_unregister_act X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1d731ac923c5223eed18589704f5f69162e85850;p=android-x86%2Fsystem-bt.git Remove unused parameter from bta_hd_unregister_act Bug: 159815595 Tag: #refactor Test: compile & verify basic functions working Change-Id: Iefae3c72524d7349da92ad63db39129d9202ec2a --- diff --git a/bta/hd/bta_hd_act.cc b/bta/hd/bta_hd_act.cc index a210dcc10..b365e7255 100644 --- a/bta/hd/bta_hd_act.cc +++ b/bta/hd/bta_hd_act.cc @@ -219,7 +219,7 @@ void bta_hd_register_act(tBTA_HD_DATA* p_data) { * Returns void * ******************************************************************************/ -void bta_hd_unregister_act(UNUSED_ATTR tBTA_HD_DATA* p_data) { +void bta_hd_unregister_act() { tBTA_HD_STATUS status = BTA_HD_OK; APPL_TRACE_API("%s", __func__); @@ -255,7 +255,7 @@ void bta_hd_unregister2_act(tBTA_HD_DATA* p_data) { bta_hd_close_act(p_data); // then unregister - bta_hd_unregister_act(p_data); + bta_hd_unregister_act(); if (bta_hd_cb.disable_w4_close) { bta_hd_api_disable(); diff --git a/bta/hd/bta_hd_int.h b/bta/hd/bta_hd_int.h index 0748b677e..17cf0e425 100644 --- a/bta/hd/bta_hd_int.h +++ b/bta/hd/bta_hd_int.h @@ -152,7 +152,7 @@ extern void bta_hd_api_enable(tBTA_HD_DATA* p_data); extern void bta_hd_api_disable(void); extern void bta_hd_register_act(tBTA_HD_DATA* p_data); -extern void bta_hd_unregister_act(tBTA_HD_DATA* p_data); +extern void bta_hd_unregister_act(); extern void bta_hd_unregister2_act(tBTA_HD_DATA* p_data); extern void bta_hd_connect_act(tBTA_HD_DATA* p_data); extern void bta_hd_disconnect_act(tBTA_HD_DATA* p_data); diff --git a/bta/hd/bta_hd_main.cc b/bta/hd/bta_hd_main.cc index 037ea21d9..628069d43 100644 --- a/bta/hd/bta_hd_main.cc +++ b/bta/hd/bta_hd_main.cc @@ -78,7 +78,7 @@ static void bta_hd_better_state_machine(uint16_t event, tBTA_HD_DATA* p_data) { switch (event) { case BTA_HD_API_UNREGISTER_APP_EVT: set_state(BTA_HD_INIT_ST); - bta_hd_unregister_act(p_data); + bta_hd_unregister_act(); break; case BTA_HD_API_CONNECT_EVT: bta_hd_connect_act(p_data);