diff options
author | Gustavo Padovan <gustavo.padovan@collabora.co.uk> | 2012-10-24 09:18:41 -0400 |
---|---|---|
committer | Gustavo Padovan <gustavo.padovan@collabora.co.uk> | 2012-10-24 09:18:41 -0400 |
commit | 4611dfa85ece8a26ff46b099a6d91df733066c73 (patch) | |
tree | a5ec4e542ecdc0896ab7e9cc3991ef6c9ab95c62 | |
parent | 8fa19098ebc700f14b0f8d0fb957e7748e14c44b (diff) |
Bluetooth: Replace *_init() for *_setup()
le_init() and bredr_init() are now called le_setup() and bredr_setup() to
avoid duplicates names over the tree even if they are all static.
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
-rw-r--r-- | net/bluetooth/hci_event.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index fd5a51ccb8e4..0b9e646d1758 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c | |||
@@ -559,7 +559,7 @@ static void hci_setup_event_mask(struct hci_dev *hdev) | |||
559 | } | 559 | } |
560 | } | 560 | } |
561 | 561 | ||
562 | static void bredr_init(struct hci_dev *hdev) | 562 | static void bredr_setup(struct hci_dev *hdev) |
563 | { | 563 | { |
564 | struct hci_cp_delete_stored_link_key cp; | 564 | struct hci_cp_delete_stored_link_key cp; |
565 | __le16 param; | 565 | __le16 param; |
@@ -590,7 +590,7 @@ static void bredr_init(struct hci_dev *hdev) | |||
590 | hci_send_cmd(hdev, HCI_OP_DELETE_STORED_LINK_KEY, sizeof(cp), &cp); | 590 | hci_send_cmd(hdev, HCI_OP_DELETE_STORED_LINK_KEY, sizeof(cp), &cp); |
591 | } | 591 | } |
592 | 592 | ||
593 | static void le_init(struct hci_dev *hdev) | 593 | static void le_setup(struct hci_dev *hdev) |
594 | { | 594 | { |
595 | /* Read LE Buffer Size */ | 595 | /* Read LE Buffer Size */ |
596 | hci_send_cmd(hdev, HCI_OP_LE_READ_BUFFER_SIZE, 0, NULL); | 596 | hci_send_cmd(hdev, HCI_OP_LE_READ_BUFFER_SIZE, 0, NULL); |
@@ -608,10 +608,10 @@ static void hci_setup(struct hci_dev *hdev) | |||
608 | hci_send_cmd(hdev, HCI_OP_READ_BD_ADDR, 0, NULL); | 608 | hci_send_cmd(hdev, HCI_OP_READ_BD_ADDR, 0, NULL); |
609 | 609 | ||
610 | if (lmp_bredr_capable(hdev)) | 610 | if (lmp_bredr_capable(hdev)) |
611 | bredr_init(hdev); | 611 | bredr_setup(hdev); |
612 | 612 | ||
613 | if (lmp_le_capable(hdev)) | 613 | if (lmp_le_capable(hdev)) |
614 | le_init(hdev); | 614 | le_setup(hdev); |
615 | 615 | ||
616 | hci_setup_event_mask(hdev); | 616 | hci_setup_event_mask(hdev); |
617 | 617 | ||