| Message ID | 1657858487-29052-1-git-send-email-quic_zijuhu@quicinc.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v2] Bluetooth: hci_sync: Remove redundant func definition | expand |
On 7/15/2022 3:34 PM, Paul Menzel wrote: > Dear Zijun, > > > Thank you for the patch. > > Am 15.07.22 um 06:14 schrieb Zijun Hu: >> both hci_request.c and hci_sync.c have the same definition >> for disconnected_accept_list_entries(), so remove a redundant >> copy. > > Please use 75 characters per line for Linux commit message bodies. That way, only two instead of three lines are needed. thanks for your suggestion, correct within v4 sent. could you code review again? >> Signed-off-by: Zijun Hu <quic_zijuhu@quicinc.com> >> --- >> v1->v2 >> -remove the func copy within hci_request.c instead of hci_sync.c >> net/bluetooth/hci_request.c | 18 ------------------ >> net/bluetooth/hci_request.h | 2 ++ >> net/bluetooth/hci_sync.c | 2 +- >> 3 files changed, 3 insertions(+), 19 deletions(-) > > […] > > > Kind regards, > > Paul
diff --git a/net/bluetooth/hci_request.c b/net/bluetooth/hci_request.c index 635cc5fb451e..edec0447aaa7 100644 --- a/net/bluetooth/hci_request.c +++ b/net/bluetooth/hci_request.c @@ -1784,24 +1784,6 @@ int hci_update_random_address(struct hci_request *req, bool require_privacy, return 0; } -static bool disconnected_accept_list_entries(struct hci_dev *hdev) -{ - struct bdaddr_list *b; - - list_for_each_entry(b, &hdev->accept_list, list) { - struct hci_conn *conn; - - conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &b->bdaddr); - if (!conn) - return true; - - if (conn->state != BT_CONNECTED && conn->state != BT_CONFIG) - return true; - } - - return false; -} - void __hci_req_update_scan(struct hci_request *req) { struct hci_dev *hdev = req->hdev; diff --git a/net/bluetooth/hci_request.h b/net/bluetooth/hci_request.h index 7f8df258e295..e80b500878d9 100644 --- a/net/bluetooth/hci_request.h +++ b/net/bluetooth/hci_request.h @@ -120,6 +120,8 @@ void __hci_req_update_scan(struct hci_request *req); int hci_update_random_address(struct hci_request *req, bool require_privacy, bool use_rpa, u8 *own_addr_type); +bool disconnected_accept_list_entries(struct hci_dev *hdev); + int hci_abort_conn(struct hci_conn *conn, u8 reason); void __hci_abort_conn(struct hci_request *req, struct hci_conn *conn, u8 reason); diff --git a/net/bluetooth/hci_sync.c b/net/bluetooth/hci_sync.c index 212b0cdb25f5..48a262f0ae49 100644 --- a/net/bluetooth/hci_sync.c +++ b/net/bluetooth/hci_sync.c @@ -2419,7 +2419,7 @@ int hci_write_fast_connectable_sync(struct hci_dev *hdev, bool enable) return err; } -static bool disconnected_accept_list_entries(struct hci_dev *hdev) +bool disconnected_accept_list_entries(struct hci_dev *hdev) { struct bdaddr_list *b;
both hci_request.c and hci_sync.c have the same definition for disconnected_accept_list_entries(), so remove a redundant copy. Signed-off-by: Zijun Hu <quic_zijuhu@quicinc.com> --- v1->v2 -remove the func copy within hci_request.c instead of hci_sync.c net/bluetooth/hci_request.c | 18 ------------------ net/bluetooth/hci_request.h | 2 ++ net/bluetooth/hci_sync.c | 2 +- 3 files changed, 3 insertions(+), 19 deletions(-)