Skip to contentSkip to conversation

Bluetooth: trailing whitespace

PATCH In review Paul McQuade 2 participants 6 messages Mar 19, 2018 – Mar 20, 2018 Bluetooth drivers

lore
Share & tools
lore

Paul McQuade

author
#0 lore raw

PATCH 1/4 Bluetooth: trailing whitespace

Removed whitespace

Signed-off-by Paul McQuade <[email protected]>
---
 drivers/bluetooth/bfusb.c     | 2 +-
 drivers/bluetooth/btuart_cs.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/bluetooth/bfusb.c +1 -1
index ab090a313a5f..0d5b403fe431 100644
@@ -148,7 +148,7 @@ static int bfusb_send_bulk(struct bfusb_data *data, struct sk_buff *skb)
 
 	err = usb_submit_urb(urb, GFP_ATOMIC);
 	if (err) {
-		BT_ERR("%s bulk tx submit failed urb %p err %d", 
+		BT_ERR("%s bulk tx submit failed urb %p err %d",
 					data->hdev->name, urb, err);
 		skb_unlink(skb, &data->pending_q);
 		usb_free_urb(urb);
drivers/bluetooth/btuart_cs.c +2 -2
index 310e9c2e09b6..8dce5bfad947 100644
@@ -365,10 +365,10 @@ static void btuart_change_speed(struct btuart_info *info,
 
 	fcr = UART_FCR_ENABLE_FIFO | UART_FCR_CLEAR_RCVR | UART_FCR_CLEAR_XMIT;
 
-	/* 
+	/*
 	 * Use trigger level 1 to avoid 3 ms. timeout delay at 9600 bps, and
 	 * almost 1,7 ms at 19200 bps. At speeds above that we can just forget
-	 * about this timeout since it will always be fast enough. 
+	 * about this timeout since it will always be fast enough.
 	 */
 
 	if (speed < 38400)
Signature · 1 line
2.16.2
author
#1 lore raw

PATCH 2/4 Bluetooth: Use tabs where possible

code indent should use tabs where possible

Signed-off-by Paul McQuade <[email protected]>
---
 drivers/bluetooth/hci_intel.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/bluetooth/hci_intel.c +6 -6
index 7c166e3b308b..2a7bdc0bad92 100644
@@ -609,12 +609,12 @@ static int intel_setup(struct hci_uart *hu)
 		return -EINVAL;
 	}
 
-        /* Check for supported iBT hardware variants of this firmware
-         * loading method.
-         *
-         * This check has been put in place to ensure correct forward
-         * compatibility options when newer hardware variants come along.
-         */
+	/* Check for supported iBT hardware variants of this firmware
+	 * loading method.
+	 *
+	 * This check has been put in place to ensure correct forward
+	 * compatibility options when newer hardware variants come along.
+	 */
 	switch (ver.hw_variant) {
 	case 0x0b:	/* LnP */
 	case 0x0c:	/* WsP */
Signature · 1 line
2.16.2
author
#2 lore raw

PATCH 3/4 Bluetooth: trailing statements

In reply to Paul McQuade

trailing statements should be on next line

Signed-off-by Paul McQuade <[email protected]>
---
 drivers/bluetooth/hci_ll.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/bluetooth/hci_ll.c +2 -1
index 1b4417a623a4..06d859d82de8 100644
@@ -567,7 +567,8 @@ static int read_local_version(struct hci_dev *hdev)
 	version = le16_to_cpu(ver->lmp_subver);
 
 out:
-	if (err) bt_dev_err(hdev, "Failed to read TI version info: %d", err);
+	if (err)
+	bt_dev_err(hdev, "Failed to read TI version info: %d", err);
 	kfree_skb(skb);
 	return err ? err : version;
 }
Signature · 1 line
2.16.2
maintainer
#3 lore raw

Re: [PATCH 3/4] Bluetooth: trailing statements

Hi Paul,

Quoted 15 lines

trailing statements should be on next line

Signed-off-by Paul McQuade <[email protected]>

---
drivers/bluetooth/hci_ll.c | 3 ++-

1 file changed, 2 insertions(+), 1 deletion(-)
drivers/bluetooth/hci_ll.c +0 -0
index 1b4417a623a4..06d859d82de8 100644
@@ -567,7 +567,8 @@ static int read_local_version(struct hci_dev *hdev)
 	version = le16_to_cpu(ver->lmp_subver);

out:

drivers/bluetooth/hci_ll.c static int read_local_version(struct hci_dev *hdev) · line 571

Quoted 3 lines
drivers/bluetooth/hci_ll.c +2 -1
-	if (err) bt_dev_err(hdev, "Failed to read TI version info: %d", err);
+	if (err)
+	bt_dev_err(hdev, "Failed to read TI version info: %d", err);

actually this needs to be indented one further since it is the action of the if clause.

Regards

Marcel

author
#4 lore raw

PATCH 4/4 Bluetooth: space required

In reply to Paul McQuade

space required before the open parenthesis '('

Signed-off-by Paul McQuade <[email protected]>
---
 drivers/bluetooth/hci_serdev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/bluetooth/hci_serdev.c +1 -1
index e0e6461b9200..ec4b6b2bbf9a 100644
@@ -94,7 +94,7 @@ static void hci_uart_write_work(struct work_struct *work)
 			hci_uart_tx_complete(hu, hci_skb_pkt_type(skb));
 			kfree_skb(skb);
 		}
-	} while(test_bit(HCI_UART_TX_WAKEUP, &hu->tx_state));
+	} while (test_bit(HCI_UART_TX_WAKEUP, &hu->tx_state));
 
 	clear_bit(HCI_UART_SENDING, &hu->tx_state);
 }
Signature · 1 line
2.16.2
maintainer
#5 lore raw
In reply to Paul McQuade

Hi Paul,

Quoted 26 lines

Removed whitespace

Signed-off-by Paul McQuade <[email protected]>

---
drivers/bluetooth/bfusb.c | 2 +-
drivers/bluetooth/btuart_cs.c | 4 ++--

2 files changed, 3 insertions(+), 3 deletions(-)
drivers/bluetooth/bfusb.c +1 -1
index ab090a313a5f..0d5b403fe431 100644
@@ -148,7 +148,7 @@ static int bfusb_send_bulk(struct bfusb_data *data, struct sk_buff *skb)
 
 	err = usb_submit_urb(urb, GFP_ATOMIC);
 	if (err) {
-		BT_ERR("%s bulk tx submit failed urb %p err %d", 
+		BT_ERR("%s bulk tx submit failed urb %p err %d",
 					data->hdev->name, urb, err);
 		skb_unlink(skb, &data->pending_q);
 		usb_free_urb(urb);
drivers/bluetooth/btuart_cs.c +0 -0
index 310e9c2e09b6..8dce5bfad947 100644

drivers/bluetooth/btuart_cs.c static void btuart_change_speed(struct btuart_info *info, · line 372

Quoted 10 lines
drivers/bluetooth/btuart_cs.c +2 -2
@@ -365,10 +365,10 @@ static void btuart_change_speed(struct btuart_info *info,
 
 	fcr = UART_FCR_ENABLE_FIFO | UART_FCR_CLEAR_RCVR | UART_FCR_CLEAR_XMIT;
 
-	/* 
+	/*
 	 * Use trigger level 1 to avoid 3 ms. timeout delay at 9600 bps, and
 	 * almost 1,7 ms at 19200 bps. At speeds above that we can just forget
-	 * about this timeout since it will always be fast enough. 
+	 * about this timeout since it will always be fast enough.
 	 */

drop the btuart_cs. change since I will be removing that driver. It is not bound to any hardware anyway and thus just some legacy that has been left around.

Regards

Marcel