Commit bb0084ec authored by Marcel Holtmann's avatar Marcel Holtmann Committed by Johan Hedberg
Browse files

Bluetooth: hci_h5: 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: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
parent 00b383b8

drivers/bluetooth/hci_h5.c

+13 −13
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ static void h5_peer_reset(struct hci_uart *hu) 
{

	struct h5 *h5 = hu->priv;



	BT_ERR("Peer device has reset");

	bt_dev_err(hu->hdev, "Peer device has reset");



	h5->state = H5_UNINITIALIZED;
@@ -438,13 +438,13 @@ static int h5_rx_3wire_hdr(struct hci_uart *hu, unsigned char c) 
	       H5_HDR_LEN(hdr));



	if (((hdr[0] + hdr[1] + hdr[2] + hdr[3]) & 0xff) != 0xff) {

		BT_ERR("Invalid header checksum");

		bt_dev_err(hu->hdev, "Invalid header checksum");

		h5_reset_rx(h5);

		return 0;

	}



	if (H5_HDR_RELIABLE(hdr) && H5_HDR_SEQ(hdr) != h5->tx_ack) {

		BT_ERR("Out-of-order packet arrived (%u != %u)",

		bt_dev_err(hu->hdev, "Out-of-order packet arrived (%u != %u)",

			   H5_HDR_SEQ(hdr), h5->tx_ack);

		h5_reset_rx(h5);

		return 0;
@@ -452,7 +452,7 @@ static int h5_rx_3wire_hdr(struct hci_uart *hu, unsigned char c) 


	if (h5->state != H5_ACTIVE &&

	    H5_HDR_PKT_TYPE(hdr) != HCI_3WIRE_LINK_PKT) {

		BT_ERR("Non-link packet received in non-active state");

		bt_dev_err(hu->hdev, "Non-link packet received in non-active state");

		h5_reset_rx(h5);

		return 0;

	}
@@ -475,7 +475,7 @@ static int h5_rx_pkt_start(struct hci_uart *hu, unsigned char c) 


	h5->rx_skb = bt_skb_alloc(H5_MAX_LEN, GFP_ATOMIC);

	if (!h5->rx_skb) {

		BT_ERR("Can't allocate mem for new packet");

		bt_dev_err(hu->hdev, "Can't allocate mem for new packet");

		h5_reset_rx(h5);

		return -ENOMEM;

	}
@@ -551,7 +551,7 @@ static int h5_recv(struct hci_uart *hu, const void *data, int count) 


		if (h5->rx_pending > 0) {

			if (*ptr == SLIP_DELIMITER) {

				BT_ERR("Too short H5 packet");

				bt_dev_err(hu->hdev, "Too short H5 packet");

				h5_reset_rx(h5);

				continue;

			}
@@ -578,13 +578,13 @@ static int h5_enqueue(struct hci_uart *hu, struct sk_buff *skb) 
	struct h5 *h5 = hu->priv;



	if (skb->len > 0xfff) {

		BT_ERR("Packet too long (%u bytes)", skb->len);

		bt_dev_err(hu->hdev, "Packet too long (%u bytes)", skb->len);

		kfree_skb(skb);

		return 0;

	}



	if (h5->state != H5_ACTIVE) {

		BT_ERR("Ignoring HCI data in non-active state");

		bt_dev_err(hu->hdev, "Ignoring HCI data in non-active state");

		kfree_skb(skb);

		return 0;

	}
@@ -601,7 +601,7 @@ static int h5_enqueue(struct hci_uart *hu, struct sk_buff *skb) 
		break;



	default:

		BT_ERR("Unknown packet type %u", hci_skb_pkt_type(skb));

		bt_dev_err(hu->hdev, "Unknown packet type %u", hci_skb_pkt_type(skb));

		kfree_skb(skb);

		break;

	}
@@ -657,7 +657,7 @@ static struct sk_buff *h5_prepare_pkt(struct hci_uart *hu, u8 pkt_type, 
	int i;



	if (!valid_packet_type(pkt_type)) {

		BT_ERR("Unknown packet type %u", pkt_type);

		bt_dev_err(hu->hdev, "Unknown packet type %u", pkt_type);

		return NULL;

	}
@@ -734,7 +734,7 @@ static struct sk_buff *h5_dequeue(struct hci_uart *hu) 
		}



		skb_queue_head(&h5->unrel, skb);

		BT_ERR("Could not dequeue pkt because alloc_skb failed");

		bt_dev_err(hu->hdev, "Could not dequeue pkt because alloc_skb failed");

	}



	spin_lock_irqsave_nested(&h5->unack.lock, flags, SINGLE_DEPTH_NESTING);
@@ -754,7 +754,7 @@ static struct sk_buff *h5_dequeue(struct hci_uart *hu) 
		}



		skb_queue_head(&h5->rel, skb);

		BT_ERR("Could not dequeue pkt because alloc_skb failed");

		bt_dev_err(hu->hdev, "Could not dequeue pkt because alloc_skb failed");

	}



unlock: