Skip to content

Commit 2064ee3

Browse files
holtmannJohan Hedberg
holtmann
authored and
Johan Hedberg
committed
Bluetooth: Use bt_dev_err and bt_dev_info when possible
In case of using BT_ERR and BT_INFO, convert to bt_dev_err and bt_dev_info when possible. This allows for controller specific reporting. Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
1 parent a9ee77a commit 2064ee3

21 files changed

+279
-280
lines changed

‎drivers/bluetooth/bpa10x.c

+6-9
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ static void bpa10x_rx_complete(struct urb *urb)
117117
bpa10x_recv_pkts,
118118
ARRAY_SIZE(bpa10x_recv_pkts));
119119
if (IS_ERR(data->rx_skb[idx])) {
120-
BT_ERR("%s corrupted event packet", hdev->name);
120+
bt_dev_err(hdev, "corrupted event packet");
121121
hdev->stat.err_rx++;
122122
data->rx_skb[idx] = NULL;
123123
}
@@ -127,8 +127,7 @@ static void bpa10x_rx_complete(struct urb *urb)
127127

128128
err = usb_submit_urb(urb, GFP_ATOMIC);
129129
if (err < 0) {
130-
BT_ERR("%s urb %p failed to resubmit (%d)",
131-
hdev->name, urb, -err);
130+
bt_dev_err(hdev, "urb %p failed to resubmit (%d)", urb, -err);
132131
usb_unanchor_urb(urb);
133132
}
134133
}
@@ -164,8 +163,7 @@ static inline int bpa10x_submit_intr_urb(struct hci_dev *hdev)
164163

165164
err = usb_submit_urb(urb, GFP_KERNEL);
166165
if (err < 0) {
167-
BT_ERR("%s urb %p submission failed (%d)",
168-
hdev->name, urb, -err);
166+
bt_dev_err(hdev, "urb %p submission failed (%d)", urb, -err);
169167
usb_unanchor_urb(urb);
170168
}
171169

@@ -205,8 +203,7 @@ static inline int bpa10x_submit_bulk_urb(struct hci_dev *hdev)
205203

206204
err = usb_submit_urb(urb, GFP_KERNEL);
207205
if (err < 0) {
208-
BT_ERR("%s urb %p submission failed (%d)",
209-
hdev->name, urb, -err);
206+
bt_dev_err(hdev, "urb %p submission failed (%d)", urb, -err);
210207
usb_unanchor_urb(urb);
211208
}
212209

@@ -272,7 +269,7 @@ static int bpa10x_setup(struct hci_dev *hdev)
272269
if (IS_ERR(skb))
273270
return PTR_ERR(skb);
274271

275-
BT_INFO("%s: %s", hdev->name, (char *)(skb->data + 1));
272+
bt_dev_info(hdev, "%s", (char *)(skb->data + 1));
276273

277274
hci_set_fw_info(hdev, "%s", skb->data + 1);
278275

@@ -348,7 +345,7 @@ static int bpa10x_send_frame(struct hci_dev *hdev, struct sk_buff *skb)
348345

349346
err = usb_submit_urb(urb, GFP_ATOMIC);
350347
if (err < 0) {
351-
BT_ERR("%s urb %p submission failed", hdev->name, urb);
348+
bt_dev_err(hdev, "urb %p submission failed", urb);
352349
kfree(urb->setup_packet);
353350
usb_unanchor_urb(urb);
354351
}

‎drivers/bluetooth/bt3c_cs.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ static irqreturn_t bt3c_interrupt(int irq, void *dev_inst)
355355
} else if ((stat & 0xff) != 0xff) {
356356
if (stat & 0x0020) {
357357
int status = bt3c_read(iobase, 0x7002) & 0x10;
358-
BT_INFO("%s: Antenna %s", info->hdev->name,
358+
bt_dev_info(info->hdev, "Antenna %s",
359359
status ? "out" : "in");
360360
}
361361
if (stat & 0x0001)

‎drivers/bluetooth/btbcm.c

+50-53
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,12 @@ int btbcm_check_bdaddr(struct hci_dev *hdev)
4545
HCI_INIT_TIMEOUT);
4646
if (IS_ERR(skb)) {
4747
int err = PTR_ERR(skb);
48-
BT_ERR("%s: BCM: Reading device address failed (%d)",
49-
hdev->name, err);
48+
bt_dev_err(hdev, "BCM: Reading device address failed (%d)", err);
5049
return err;
5150
}
5251

5352
if (skb->len != sizeof(*bda)) {
54-
BT_ERR("%s: BCM: Device address length mismatch", hdev->name);
53+
bt_dev_err(hdev, "BCM: Device address length mismatch");
5554
kfree_skb(skb);
5655
return -EIO;
5756
}
@@ -74,8 +73,8 @@ int btbcm_check_bdaddr(struct hci_dev *hdev)
7473
if (!bacmp(&bda->bdaddr, BDADDR_BCM20702A0) ||
7574
!bacmp(&bda->bdaddr, BDADDR_BCM4324B3) ||
7675
!bacmp(&bda->bdaddr, BDADDR_BCM4330B1)) {
77-
BT_INFO("%s: BCM: Using default device address (%pMR)",
78-
hdev->name, &bda->bdaddr);
76+
bt_dev_info(hdev, "BCM: Using default device address (%pMR)",
77+
&bda->bdaddr);
7978
set_bit(HCI_QUIRK_INVALID_BDADDR, &hdev->quirks);
8079
}
8180

@@ -93,8 +92,7 @@ int btbcm_set_bdaddr(struct hci_dev *hdev, const bdaddr_t *bdaddr)
9392
skb = __hci_cmd_sync(hdev, 0xfc01, 6, bdaddr, HCI_INIT_TIMEOUT);
9493
if (IS_ERR(skb)) {
9594
err = PTR_ERR(skb);
96-
BT_ERR("%s: BCM: Change address command failed (%d)",
97-
hdev->name, err);
95+
bt_dev_err(hdev, "BCM: Change address command failed (%d)", err);
9896
return err;
9997
}
10098
kfree_skb(skb);
@@ -116,8 +114,8 @@ int btbcm_patchram(struct hci_dev *hdev, const struct firmware *fw)
116114
skb = __hci_cmd_sync(hdev, 0xfc2e, 0, NULL, HCI_INIT_TIMEOUT);
117115
if (IS_ERR(skb)) {
118116
err = PTR_ERR(skb);
119-
BT_ERR("%s: BCM: Download Minidrv command failed (%d)",
120-
hdev->name, err);
117+
bt_dev_err(hdev, "BCM: Download Minidrv command failed (%d)",
118+
err);
121119
goto done;
122120
}
123121
kfree_skb(skb);
@@ -136,7 +134,7 @@ int btbcm_patchram(struct hci_dev *hdev, const struct firmware *fw)
136134
fw_size -= sizeof(*cmd);
137135

138136
if (fw_size < cmd->plen) {
139-
BT_ERR("%s: BCM: Patch is corrupted", hdev->name);
137+
bt_dev_err(hdev, "BCM: Patch is corrupted");
140138
err = -EINVAL;
141139
goto done;
142140
}
@@ -151,8 +149,8 @@ int btbcm_patchram(struct hci_dev *hdev, const struct firmware *fw)
151149
HCI_INIT_TIMEOUT);
152150
if (IS_ERR(skb)) {
153151
err = PTR_ERR(skb);
154-
BT_ERR("%s: BCM: Patch command %04x failed (%d)",
155-
hdev->name, opcode, err);
152+
bt_dev_err(hdev, "BCM: Patch command %04x failed (%d)",
153+
opcode, err);
156154
goto done;
157155
}
158156
kfree_skb(skb);
@@ -173,7 +171,7 @@ static int btbcm_reset(struct hci_dev *hdev)
173171
skb = __hci_cmd_sync(hdev, HCI_OP_RESET, 0, NULL, HCI_INIT_TIMEOUT);
174172
if (IS_ERR(skb)) {
175173
int err = PTR_ERR(skb);
176-
BT_ERR("%s: BCM: Reset failed (%d)", hdev->name, err);
174+
bt_dev_err(hdev, "BCM: Reset failed (%d)", err);
177175
return err;
178176
}
179177
kfree_skb(skb);
@@ -191,13 +189,13 @@ static struct sk_buff *btbcm_read_local_name(struct hci_dev *hdev)
191189
skb = __hci_cmd_sync(hdev, HCI_OP_READ_LOCAL_NAME, 0, NULL,
192190
HCI_INIT_TIMEOUT);
193191
if (IS_ERR(skb)) {
194-
BT_ERR("%s: BCM: Reading local name failed (%ld)",
195-
hdev->name, PTR_ERR(skb));
192+
bt_dev_err(hdev, "BCM: Reading local name failed (%ld)",
193+
PTR_ERR(skb));
196194
return skb;
197195
}
198196

199197
if (skb->len != sizeof(struct hci_rp_read_local_name)) {
200-
BT_ERR("%s: BCM: Local name length mismatch", hdev->name);
198+
bt_dev_err(hdev, "BCM: Local name length mismatch");
201199
kfree_skb(skb);
202200
return ERR_PTR(-EIO);
203201
}
@@ -212,13 +210,13 @@ static struct sk_buff *btbcm_read_local_version(struct hci_dev *hdev)
212210
skb = __hci_cmd_sync(hdev, HCI_OP_READ_LOCAL_VERSION, 0, NULL,
213211
HCI_INIT_TIMEOUT);
214212
if (IS_ERR(skb)) {
215-
BT_ERR("%s: BCM: Reading local version info failed (%ld)",
216-
hdev->name, PTR_ERR(skb));
213+
bt_dev_err(hdev, "BCM: Reading local version info failed (%ld)",
214+
PTR_ERR(skb));
217215
return skb;
218216
}
219217

220218
if (skb->len != sizeof(struct hci_rp_read_local_version)) {
221-
BT_ERR("%s: BCM: Local version length mismatch", hdev->name);
219+
bt_dev_err(hdev, "BCM: Local version length mismatch");
222220
kfree_skb(skb);
223221
return ERR_PTR(-EIO);
224222
}
@@ -232,13 +230,13 @@ static struct sk_buff *btbcm_read_verbose_config(struct hci_dev *hdev)
232230

233231
skb = __hci_cmd_sync(hdev, 0xfc79, 0, NULL, HCI_INIT_TIMEOUT);
234232
if (IS_ERR(skb)) {
235-
BT_ERR("%s: BCM: Read verbose config info failed (%ld)",
236-
hdev->name, PTR_ERR(skb));
233+
bt_dev_err(hdev, "BCM: Read verbose config info failed (%ld)",
234+
PTR_ERR(skb));
237235
return skb;
238236
}
239237

240238
if (skb->len != 7) {
241-
BT_ERR("%s: BCM: Verbose config length mismatch", hdev->name);
239+
bt_dev_err(hdev, "BCM: Verbose config length mismatch");
242240
kfree_skb(skb);
243241
return ERR_PTR(-EIO);
244242
}
@@ -252,14 +250,13 @@ static struct sk_buff *btbcm_read_controller_features(struct hci_dev *hdev)
252250

253251
skb = __hci_cmd_sync(hdev, 0xfc6e, 0, NULL, HCI_INIT_TIMEOUT);
254252
if (IS_ERR(skb)) {
255-
BT_ERR("%s: BCM: Read controller features failed (%ld)",
256-
hdev->name, PTR_ERR(skb));
253+
bt_dev_err(hdev, "BCM: Read controller features failed (%ld)",
254+
PTR_ERR(skb));
257255
return skb;
258256
}
259257

260258
if (skb->len != 9) {
261-
BT_ERR("%s: BCM: Controller features length mismatch",
262-
hdev->name);
259+
bt_dev_err(hdev, "BCM: Controller features length mismatch");
263260
kfree_skb(skb);
264261
return ERR_PTR(-EIO);
265262
}
@@ -273,13 +270,13 @@ static struct sk_buff *btbcm_read_usb_product(struct hci_dev *hdev)
273270

274271
skb = __hci_cmd_sync(hdev, 0xfc5a, 0, NULL, HCI_INIT_TIMEOUT);
275272
if (IS_ERR(skb)) {
276-
BT_ERR("%s: BCM: Read USB product info failed (%ld)",
277-
hdev->name, PTR_ERR(skb));
273+
bt_dev_err(hdev, "BCM: Read USB product info failed (%ld)",
274+
PTR_ERR(skb));
278275
return skb;
279276
}
280277

281278
if (skb->len != 5) {
282-
BT_ERR("%s: BCM: USB product length mismatch", hdev->name);
279+
bt_dev_err(hdev, "BCM: USB product length mismatch");
283280
kfree_skb(skb);
284281
return ERR_PTR(-EIO);
285282
}
@@ -296,23 +293,23 @@ static int btbcm_read_info(struct hci_dev *hdev)
296293
if (IS_ERR(skb))
297294
return PTR_ERR(skb);
298295

299-
BT_INFO("%s: BCM: chip id %u", hdev->name, skb->data[1]);
296+
bt_dev_info(hdev, "BCM: chip id %u", skb->data[1]);
300297
kfree_skb(skb);
301298

302299
/* Read Controller Features */
303300
skb = btbcm_read_controller_features(hdev);
304301
if (IS_ERR(skb))
305302
return PTR_ERR(skb);
306303

307-
BT_INFO("%s: BCM: features 0x%2.2x", hdev->name, skb->data[1]);
304+
bt_dev_info(hdev, "BCM: features 0x%2.2x", skb->data[1]);
308305
kfree_skb(skb);
309306

310307
/* Read Local Name */
311308
skb = btbcm_read_local_name(hdev);
312309
if (IS_ERR(skb))
313310
return PTR_ERR(skb);
314311

315-
BT_INFO("%s: %s", hdev->name, (char *)(skb->data + 1));
312+
bt_dev_info(hdev, "%s", (char *)(skb->data + 1));
316313
kfree_skb(skb);
317314

318315
return 0;
@@ -378,9 +375,9 @@ int btbcm_initialize(struct hci_dev *hdev, char *fw_name, size_t len)
378375
return 0;
379376
}
380377

381-
BT_INFO("%s: %s (%3.3u.%3.3u.%3.3u) build %4.4u", hdev->name,
382-
hw_name ? : "BCM", (subver & 0xe000) >> 13,
383-
(subver & 0x1f00) >> 8, (subver & 0x00ff), rev & 0x0fff);
378+
bt_dev_info(hdev, "%s (%3.3u.%3.3u.%3.3u) build %4.4u",
379+
hw_name ? : "BCM", (subver & 0xe000) >> 13,
380+
(subver & 0x1f00) >> 8, (subver & 0x00ff), rev & 0x0fff);
384381

385382
return 0;
386383
}
@@ -408,9 +405,9 @@ int btbcm_finalize(struct hci_dev *hdev)
408405
subver = le16_to_cpu(ver->lmp_subver);
409406
kfree_skb(skb);
410407

411-
BT_INFO("%s: BCM (%3.3u.%3.3u.%3.3u) build %4.4u", hdev->name,
412-
(subver & 0xe000) >> 13, (subver & 0x1f00) >> 8,
413-
(subver & 0x00ff), rev & 0x0fff);
408+
bt_dev_info(hdev, "BCM (%3.3u.%3.3u.%3.3u) build %4.4u",
409+
(subver & 0xe000) >> 13, (subver & 0x1f00) >> 8,
410+
(subver & 0x00ff), rev & 0x0fff);
414411

415412
btbcm_check_bdaddr(hdev);
416413

@@ -505,13 +502,13 @@ int btbcm_setup_patchram(struct hci_dev *hdev)
505502
return 0;
506503
}
507504

508-
BT_INFO("%s: %s (%3.3u.%3.3u.%3.3u) build %4.4u", hdev->name,
509-
hw_name ? : "BCM", (subver & 0xe000) >> 13,
510-
(subver & 0x1f00) >> 8, (subver & 0x00ff), rev & 0x0fff);
505+
bt_dev_info(hdev, "%s (%3.3u.%3.3u.%3.3u) build %4.4u",
506+
hw_name ? : "BCM", (subver & 0xe000) >> 13,
507+
(subver & 0x1f00) >> 8, (subver & 0x00ff), rev & 0x0fff);
511508

512509
err = request_firmware(&fw, fw_name, &hdev->dev);
513510
if (err < 0) {
514-
BT_INFO("%s: BCM: Patch %s not found", hdev->name, fw_name);
511+
bt_dev_info(hdev, "BCM: Patch %s not found", fw_name);
515512
goto done;
516513
}
517514

@@ -534,16 +531,16 @@ int btbcm_setup_patchram(struct hci_dev *hdev)
534531
subver = le16_to_cpu(ver->lmp_subver);
535532
kfree_skb(skb);
536533

537-
BT_INFO("%s: %s (%3.3u.%3.3u.%3.3u) build %4.4u", hdev->name,
538-
hw_name ? : "BCM", (subver & 0xe000) >> 13,
539-
(subver & 0x1f00) >> 8, (subver & 0x00ff), rev & 0x0fff);
534+
bt_dev_info(hdev, "%s (%3.3u.%3.3u.%3.3u) build %4.4u",
535+
hw_name ? : "BCM", (subver & 0xe000) >> 13,
536+
(subver & 0x1f00) >> 8, (subver & 0x00ff), rev & 0x0fff);
540537

541538
/* Read Local Name */
542539
skb = btbcm_read_local_name(hdev);
543540
if (IS_ERR(skb))
544541
return PTR_ERR(skb);
545542

546-
BT_INFO("%s: %s", hdev->name, (char *)(skb->data + 1));
543+
bt_dev_info(hdev, "%s", (char *)(skb->data + 1));
547544
kfree_skb(skb);
548545

549546
done:
@@ -568,31 +565,31 @@ int btbcm_setup_apple(struct hci_dev *hdev)
568565
/* Read Verbose Config Version Info */
569566
skb = btbcm_read_verbose_config(hdev);
570567
if (!IS_ERR(skb)) {
571-
BT_INFO("%s: BCM: chip id %u build %4.4u", hdev->name,
572-
skb->data[1], get_unaligned_le16(skb->data + 5));
568+
bt_dev_info(hdev, "BCM: chip id %u build %4.4u",
569+
skb->data[1], get_unaligned_le16(skb->data + 5));
573570
kfree_skb(skb);
574571
}
575572

576573
/* Read USB Product Info */
577574
skb = btbcm_read_usb_product(hdev);
578575
if (!IS_ERR(skb)) {
579-
BT_INFO("%s: BCM: product %4.4x:%4.4x", hdev->name,
580-
get_unaligned_le16(skb->data + 1),
581-
get_unaligned_le16(skb->data + 3));
576+
bt_dev_info(hdev, "BCM: product %4.4x:%4.4x",
577+
get_unaligned_le16(skb->data + 1),
578+
get_unaligned_le16(skb->data + 3));
582579
kfree_skb(skb);
583580
}
584581

585582
/* Read Controller Features */
586583
skb = btbcm_read_controller_features(hdev);
587584
if (!IS_ERR(skb)) {
588-
BT_INFO("%s: BCM: features 0x%2.2x", hdev->name, skb->data[1]);
585+
bt_dev_info(hdev, "BCM: features 0x%2.2x", skb->data[1]);
589586
kfree_skb(skb);
590587
}
591588

592589
/* Read Local Name */
593590
skb = btbcm_read_local_name(hdev);
594591
if (!IS_ERR(skb)) {
595-
BT_INFO("%s: %s", hdev->name, (char *)(skb->data + 1));
592+
bt_dev_info(hdev, "%s", (char *)(skb->data + 1));
596593
kfree_skb(skb);
597594
}
598595

0 commit comments

Comments
 (0)