summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorGustavo Padovan <gustavo.padovan@collabora.co.uk>2012-10-24 17:18:41 +0400
committerGustavo Padovan <gustavo.padovan@collabora.co.uk>2012-10-24 17:18:41 +0400
commit4611dfa85ece8a26ff46b099a6d91df733066c73 (patch)
treea5ec4e542ecdc0896ab7e9cc3991ef6c9ab95c62 /net
parent8fa19098ebc700f14b0f8d0fb957e7748e14c44b (diff)
downloadlinux-4611dfa85ece8a26ff46b099a6d91df733066c73.tar.xz
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>
Diffstat (limited to 'net')
-rw-r--r--net/bluetooth/hci_event.c8
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)
}
}
-static void bredr_init(struct hci_dev *hdev)
+static void bredr_setup(struct hci_dev *hdev)
{
struct hci_cp_delete_stored_link_key cp;
__le16 param;
@@ -590,7 +590,7 @@ static void bredr_init(struct hci_dev *hdev)
hci_send_cmd(hdev, HCI_OP_DELETE_STORED_LINK_KEY, sizeof(cp), &cp);
}
-static void le_init(struct hci_dev *hdev)
+static void le_setup(struct hci_dev *hdev)
{
/* Read LE Buffer Size */
hci_send_cmd(hdev, HCI_OP_LE_READ_BUFFER_SIZE, 0, NULL);
@@ -608,10 +608,10 @@ static void hci_setup(struct hci_dev *hdev)
hci_send_cmd(hdev, HCI_OP_READ_BD_ADDR, 0, NULL);
if (lmp_bredr_capable(hdev))
- bredr_init(hdev);
+ bredr_setup(hdev);
if (lmp_le_capable(hdev))
- le_init(hdev);
+ le_setup(hdev);
hci_setup_event_mask(hdev);