Bluetooth: Fix two minor style issues in HCI code
WARNING: min() should probably be min_t(__u16, scb->expect, count) + len = min(scb->expect, (__u16)count); WARNING: Statements terminations use 1 semicolon + INIT_LIST_HEAD(&conn->chan_list);; Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
This commit is contained in:
Родитель
e5f0e15142
Коммит
70c1f20b00
|
@ -402,7 +402,7 @@ struct hci_conn *hci_conn_add(struct hci_dev *hdev, int type, bdaddr_t *dst)
|
||||||
|
|
||||||
skb_queue_head_init(&conn->data_q);
|
skb_queue_head_init(&conn->data_q);
|
||||||
|
|
||||||
INIT_LIST_HEAD(&conn->chan_list);;
|
INIT_LIST_HEAD(&conn->chan_list);
|
||||||
|
|
||||||
INIT_DELAYED_WORK(&conn->disc_work, hci_conn_timeout);
|
INIT_DELAYED_WORK(&conn->disc_work, hci_conn_timeout);
|
||||||
setup_timer(&conn->idle_timer, hci_conn_idle, (unsigned long)conn);
|
setup_timer(&conn->idle_timer, hci_conn_idle, (unsigned long)conn);
|
||||||
|
|
|
@ -1957,7 +1957,7 @@ static int hci_reassembly(struct hci_dev *hdev, int type, void *data,
|
||||||
|
|
||||||
while (count) {
|
while (count) {
|
||||||
scb = (void *) skb->cb;
|
scb = (void *) skb->cb;
|
||||||
len = min(scb->expect, (__u16)count);
|
len = min_t(__u16, scb->expect, count);
|
||||||
|
|
||||||
memcpy(skb_put(skb, len), data, len);
|
memcpy(skb_put(skb, len), data, len);
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче