Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Bluetooth: bfusb: Switch from BT_ERR to bt_dev_err where possible

All HCI device specific error messages shall use bt_dev_err to indicate
the device name in the message.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>

authored by

Marcel Holtmann and committed by
Johan Hedberg
2a4f3909 71811cac

+16 -17
+16 -17
drivers/bluetooth/bfusb.c
··· 133 133 134 134 err = usb_submit_urb(urb, GFP_ATOMIC); 135 135 if (err) { 136 - BT_ERR("%s bulk tx submit failed urb %p err %d", 137 - data->hdev->name, urb, err); 136 + bt_dev_err(data->hdev, "bulk tx submit failed urb %p err %d", 137 + urb, err); 138 138 skb_unlink(skb, &data->pending_q); 139 139 usb_free_urb(urb); 140 140 } else ··· 232 232 233 233 err = usb_submit_urb(urb, GFP_ATOMIC); 234 234 if (err) { 235 - BT_ERR("%s bulk rx submit failed urb %p err %d", 236 - data->hdev->name, urb, err); 235 + bt_dev_err(data->hdev, "bulk rx submit failed urb %p err %d", 236 + urb, err); 237 237 skb_unlink(skb, &data->pending_q); 238 238 kfree_skb(skb); 239 239 usb_free_urb(urb); ··· 247 247 BT_DBG("bfusb %p hdr 0x%02x data %p len %d", data, hdr, buf, len); 248 248 249 249 if (hdr & 0x10) { 250 - BT_ERR("%s error in block", data->hdev->name); 250 + bt_dev_err(data->hdev, "error in block"); 251 251 kfree_skb(data->reassembly); 252 252 data->reassembly = NULL; 253 253 return -EIO; ··· 259 259 int pkt_len = 0; 260 260 261 261 if (data->reassembly) { 262 - BT_ERR("%s unexpected start block", data->hdev->name); 262 + bt_dev_err(data->hdev, "unexpected start block"); 263 263 kfree_skb(data->reassembly); 264 264 data->reassembly = NULL; 265 265 } 266 266 267 267 if (len < 1) { 268 - BT_ERR("%s no packet type found", data->hdev->name); 268 + bt_dev_err(data->hdev, "no packet type found"); 269 269 return -EPROTO; 270 270 } 271 271 ··· 277 277 struct hci_event_hdr *hdr = (struct hci_event_hdr *) buf; 278 278 pkt_len = HCI_EVENT_HDR_SIZE + hdr->plen; 279 279 } else { 280 - BT_ERR("%s event block is too short", data->hdev->name); 280 + bt_dev_err(data->hdev, "event block is too short"); 281 281 return -EILSEQ; 282 282 } 283 283 break; ··· 287 287 struct hci_acl_hdr *hdr = (struct hci_acl_hdr *) buf; 288 288 pkt_len = HCI_ACL_HDR_SIZE + __le16_to_cpu(hdr->dlen); 289 289 } else { 290 - BT_ERR("%s data block is too short", data->hdev->name); 290 + bt_dev_err(data->hdev, "data block is too short"); 291 291 return -EILSEQ; 292 292 } 293 293 break; ··· 297 297 struct hci_sco_hdr *hdr = (struct hci_sco_hdr *) buf; 298 298 pkt_len = HCI_SCO_HDR_SIZE + hdr->dlen; 299 299 } else { 300 - BT_ERR("%s audio block is too short", data->hdev->name); 300 + bt_dev_err(data->hdev, "audio block is too short"); 301 301 return -EILSEQ; 302 302 } 303 303 break; ··· 305 305 306 306 skb = bt_skb_alloc(pkt_len, GFP_ATOMIC); 307 307 if (!skb) { 308 - BT_ERR("%s no memory for the packet", data->hdev->name); 308 + bt_dev_err(data->hdev, "no memory for the packet"); 309 309 return -ENOMEM; 310 310 } 311 311 ··· 314 314 data->reassembly = skb; 315 315 } else { 316 316 if (!data->reassembly) { 317 - BT_ERR("%s unexpected continuation block", data->hdev->name); 317 + bt_dev_err(data->hdev, "unexpected continuation block"); 318 318 return -EIO; 319 319 } 320 320 } ··· 366 366 } 367 367 368 368 if (count < len) { 369 - BT_ERR("%s block extends over URB buffer ranges", 370 - data->hdev->name); 369 + bt_dev_err(data->hdev, "block extends over URB buffer ranges"); 371 370 } 372 371 373 372 if ((hdr & 0xe1) == 0xc1) ··· 390 391 391 392 err = usb_submit_urb(urb, GFP_ATOMIC); 392 393 if (err) { 393 - BT_ERR("%s bulk resubmit failed urb %p err %d", 394 - data->hdev->name, urb, err); 394 + bt_dev_err(data->hdev, "bulk resubmit failed urb %p err %d", 395 + urb, err); 395 396 } 396 397 397 398 unlock: ··· 476 477 /* Max HCI frame size seems to be 1511 + 1 */ 477 478 nskb = bt_skb_alloc(count + 32, GFP_KERNEL); 478 479 if (!nskb) { 479 - BT_ERR("Can't allocate memory for new packet"); 480 + bt_dev_err(hdev, "Can't allocate memory for new packet"); 480 481 return -ENOMEM; 481 482 } 482 483