Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Bluetooth: btusb: Fix old coding style issues 



The btusb driver has been around for a while now and it is time to
bring its coding style in sync with what has been done for the
Bluetooth subsystem and other drivers.

Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
parent 6970c34c

drivers/bluetooth/btusb.c

+58 −56
Original line number Diff line number Diff line
@@ -302,8 +302,8 @@ static void btusb_intr_complete(struct urb *urb) 
	struct btusb_data *data = hci_get_drvdata(hdev);

	int err;



	BT_DBG("%s urb %p status %d count %d", hdev->name,

					urb, urb->status, urb->actual_length);

	BT_DBG("%s urb %p status %d count %d", hdev->name, urb, urb->status,

	       urb->actual_length);



	if (!test_bit(HCI_RUNNING, &hdev->flags))

		return;
@@ -367,8 +367,7 @@ static int btusb_submit_intr_urb(struct hci_dev *hdev, gfp_t mem_flags) 
	pipe = usb_rcvintpipe(data->udev, data->intr_ep->bEndpointAddress);



	usb_fill_int_urb(urb, data->udev, pipe, buf, size,

						btusb_intr_complete, hdev,

						data->intr_ep->bInterval);

			 btusb_intr_complete, hdev, data->intr_ep->bInterval);



	urb->transfer_flags |= URB_FREE_BUFFER;
@@ -393,8 +392,8 @@ static void btusb_bulk_complete(struct urb *urb) 
	struct btusb_data *data = hci_get_drvdata(hdev);

	int err;



	BT_DBG("%s urb %p status %d count %d", hdev->name,

					urb, urb->status, urb->actual_length);

	BT_DBG("%s urb %p status %d count %d", hdev->name, urb, urb->status,

	       urb->actual_length);



	if (!test_bit(HCI_RUNNING, &hdev->flags))

		return;
@@ -455,8 +454,8 @@ static int btusb_submit_bulk_urb(struct hci_dev *hdev, gfp_t mem_flags) 


	pipe = usb_rcvbulkpipe(data->udev, data->bulk_rx_ep->bEndpointAddress);



	usb_fill_bulk_urb(urb, data->udev, pipe,

					buf, size, btusb_bulk_complete, hdev);

	usb_fill_bulk_urb(urb, data->udev, pipe, buf, size,

			  btusb_bulk_complete, hdev);



	urb->transfer_flags |= URB_FREE_BUFFER;
@@ -482,8 +481,8 @@ static void btusb_isoc_complete(struct urb *urb) 
	struct btusb_data *data = hci_get_drvdata(hdev);

	int i, err;



	BT_DBG("%s urb %p status %d count %d", hdev->name,

					urb, urb->status, urb->actual_length);

	BT_DBG("%s urb %p status %d count %d", hdev->name, urb, urb->status,

	       urb->actual_length);



	if (!test_bit(HCI_RUNNING, &hdev->flags))

		return;
@@ -604,8 +603,8 @@ static void btusb_tx_complete(struct urb *urb) 
	struct hci_dev *hdev = (struct hci_dev *)skb->dev;

	struct btusb_data *data = hci_get_drvdata(hdev);



	BT_DBG("%s urb %p status %d count %d", hdev->name,

					urb, urb->status, urb->actual_length);

	BT_DBG("%s urb %p status %d count %d", hdev->name, urb, urb->status,

	       urb->actual_length);



	if (!test_bit(HCI_RUNNING, &hdev->flags))

		goto done;
@@ -630,8 +629,8 @@ static void btusb_isoc_tx_complete(struct urb *urb) 
	struct sk_buff *skb = urb->context;

	struct hci_dev *hdev = (struct hci_dev *)skb->dev;



	BT_DBG("%s urb %p status %d count %d", hdev->name,

					urb, urb->status, urb->actual_length);

	BT_DBG("%s urb %p status %d count %d", hdev->name, urb, urb->status,

	       urb->actual_length);



	if (!test_bit(HCI_RUNNING, &hdev->flags))

		goto done;
@@ -984,6 +983,7 @@ static void btusb_work(struct work_struct *work) 


		if (hdev->voice_setting & 0x0020) {

			static const int alts[3] = { 2, 4, 5 };



			new_alts = alts[data->sco_num - 1];

		} else {

			new_alts = data->sco_num;
@@ -1400,6 +1400,7 @@ static int btusb_setup_intel(struct hci_dev *hdev) 


	if (skb->data[0]) {

		u8 evt_status = skb->data[0];



		BT_ERR("%s enable Intel manufacturer mode event failed (%02x)",

		       hdev->name, evt_status);

		kfree_skb(skb);
@@ -1761,6 +1762,7 @@ static int btusb_probe(struct usb_interface *intf, 


	if (!id->driver_info) {

		const struct usb_device_id *match;



		match = usb_match_id(intf, blacklist_table);

		if (match)

			id = match;