diff options
author | Joe Perches <joe@perches.com> | 2014-03-12 13:52:35 -0400 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2014-03-12 14:10:17 -0400 |
commit | dcf4adbfdc7ad14ca50c1133f93f998c78493c2d (patch) | |
tree | f1ab021f3730ba5607a26a9a711f10855a3c9c8e /net/bluetooth/hci_conn.c | |
parent | 4340a124dea6a6a66c7889261574a48e57e8782a (diff) |
Bluetooth: Convert uses of __constant_<foo> to <foo>
The use of __constant_<foo> has been unnecessary for quite awhile now.
Make these uses consistent with the rest of the kernel.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth/hci_conn.c')
-rw-r--r-- | net/bluetooth/hci_conn.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c index 7c713c4675ba..b4809e473a19 100644 --- a/net/bluetooth/hci_conn.c +++ b/net/bluetooth/hci_conn.c | |||
@@ -82,7 +82,7 @@ static void hci_acl_create_connection(struct hci_conn *conn) | |||
82 | cp.pscan_rep_mode = ie->data.pscan_rep_mode; | 82 | cp.pscan_rep_mode = ie->data.pscan_rep_mode; |
83 | cp.pscan_mode = ie->data.pscan_mode; | 83 | cp.pscan_mode = ie->data.pscan_mode; |
84 | cp.clock_offset = ie->data.clock_offset | | 84 | cp.clock_offset = ie->data.clock_offset | |
85 | __constant_cpu_to_le16(0x8000); | 85 | cpu_to_le16(0x8000); |
86 | } | 86 | } |
87 | 87 | ||
88 | memcpy(conn->dev_class, ie->data.dev_class, 3); | 88 | memcpy(conn->dev_class, ie->data.dev_class, 3); |
@@ -182,8 +182,8 @@ bool hci_setup_sync(struct hci_conn *conn, __u16 handle) | |||
182 | 182 | ||
183 | cp.handle = cpu_to_le16(handle); | 183 | cp.handle = cpu_to_le16(handle); |
184 | 184 | ||
185 | cp.tx_bandwidth = __constant_cpu_to_le32(0x00001f40); | 185 | cp.tx_bandwidth = cpu_to_le32(0x00001f40); |
186 | cp.rx_bandwidth = __constant_cpu_to_le32(0x00001f40); | 186 | cp.rx_bandwidth = cpu_to_le32(0x00001f40); |
187 | cp.voice_setting = cpu_to_le16(conn->setting); | 187 | cp.voice_setting = cpu_to_le16(conn->setting); |
188 | 188 | ||
189 | switch (conn->setting & SCO_AIRMODE_MASK) { | 189 | switch (conn->setting & SCO_AIRMODE_MASK) { |
@@ -225,8 +225,8 @@ void hci_le_conn_update(struct hci_conn *conn, u16 min, u16 max, | |||
225 | cp.conn_interval_max = cpu_to_le16(max); | 225 | cp.conn_interval_max = cpu_to_le16(max); |
226 | cp.conn_latency = cpu_to_le16(latency); | 226 | cp.conn_latency = cpu_to_le16(latency); |
227 | cp.supervision_timeout = cpu_to_le16(to_multiplier); | 227 | cp.supervision_timeout = cpu_to_le16(to_multiplier); |
228 | cp.min_ce_len = __constant_cpu_to_le16(0x0000); | 228 | cp.min_ce_len = cpu_to_le16(0x0000); |
229 | cp.max_ce_len = __constant_cpu_to_le16(0x0000); | 229 | cp.max_ce_len = cpu_to_le16(0x0000); |
230 | 230 | ||
231 | hci_send_cmd(hdev, HCI_OP_LE_CONN_UPDATE, sizeof(cp), &cp); | 231 | hci_send_cmd(hdev, HCI_OP_LE_CONN_UPDATE, sizeof(cp), &cp); |
232 | } | 232 | } |
@@ -337,9 +337,9 @@ static void hci_conn_idle(struct work_struct *work) | |||
337 | if (lmp_sniffsubr_capable(hdev) && lmp_sniffsubr_capable(conn)) { | 337 | if (lmp_sniffsubr_capable(hdev) && lmp_sniffsubr_capable(conn)) { |
338 | struct hci_cp_sniff_subrate cp; | 338 | struct hci_cp_sniff_subrate cp; |
339 | cp.handle = cpu_to_le16(conn->handle); | 339 | cp.handle = cpu_to_le16(conn->handle); |
340 | cp.max_latency = __constant_cpu_to_le16(0); | 340 | cp.max_latency = cpu_to_le16(0); |
341 | cp.min_remote_timeout = __constant_cpu_to_le16(0); | 341 | cp.min_remote_timeout = cpu_to_le16(0); |
342 | cp.min_local_timeout = __constant_cpu_to_le16(0); | 342 | cp.min_local_timeout = cpu_to_le16(0); |
343 | hci_send_cmd(hdev, HCI_OP_SNIFF_SUBRATE, sizeof(cp), &cp); | 343 | hci_send_cmd(hdev, HCI_OP_SNIFF_SUBRATE, sizeof(cp), &cp); |
344 | } | 344 | } |
345 | 345 | ||
@@ -348,8 +348,8 @@ static void hci_conn_idle(struct work_struct *work) | |||
348 | cp.handle = cpu_to_le16(conn->handle); | 348 | cp.handle = cpu_to_le16(conn->handle); |
349 | cp.max_interval = cpu_to_le16(hdev->sniff_max_interval); | 349 | cp.max_interval = cpu_to_le16(hdev->sniff_max_interval); |
350 | cp.min_interval = cpu_to_le16(hdev->sniff_min_interval); | 350 | cp.min_interval = cpu_to_le16(hdev->sniff_min_interval); |
351 | cp.attempt = __constant_cpu_to_le16(4); | 351 | cp.attempt = cpu_to_le16(4); |
352 | cp.timeout = __constant_cpu_to_le16(1); | 352 | cp.timeout = cpu_to_le16(1); |
353 | hci_send_cmd(hdev, HCI_OP_SNIFF_MODE, sizeof(cp), &cp); | 353 | hci_send_cmd(hdev, HCI_OP_SNIFF_MODE, sizeof(cp), &cp); |
354 | } | 354 | } |
355 | } | 355 | } |
@@ -596,9 +596,9 @@ static void hci_req_add_le_create_conn(struct hci_request *req, | |||
596 | cp.own_address_type = own_addr_type; | 596 | cp.own_address_type = own_addr_type; |
597 | cp.conn_interval_min = cpu_to_le16(conn->le_conn_min_interval); | 597 | cp.conn_interval_min = cpu_to_le16(conn->le_conn_min_interval); |
598 | cp.conn_interval_max = cpu_to_le16(conn->le_conn_max_interval); | 598 | cp.conn_interval_max = cpu_to_le16(conn->le_conn_max_interval); |
599 | cp.supervision_timeout = __constant_cpu_to_le16(0x002a); | 599 | cp.supervision_timeout = cpu_to_le16(0x002a); |
600 | cp.min_ce_len = __constant_cpu_to_le16(0x0000); | 600 | cp.min_ce_len = cpu_to_le16(0x0000); |
601 | cp.max_ce_len = __constant_cpu_to_le16(0x0000); | 601 | cp.max_ce_len = cpu_to_le16(0x0000); |
602 | 602 | ||
603 | hci_req_add(req, HCI_OP_LE_CREATE_CONN, sizeof(cp), &cp); | 603 | hci_req_add(req, HCI_OP_LE_CREATE_CONN, sizeof(cp), &cp); |
604 | 604 | ||