2018-03-19 11:38:32

by Paul McQuade

[permalink] [raw]
Subject: [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(-)

diff --git a/drivers/bluetooth/bfusb.c b/drivers/bluetooth/bfusb.c
index ab090a313a5f..0d5b403fe431 100644
--- a/drivers/bluetooth/bfusb.c
+++ b/drivers/bluetooth/bfusb.c
@@ -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);
diff --git a/drivers/bluetooth/btuart_cs.c b/drivers/bluetooth/btuart_cs.c
index 310e9c2e09b6..8dce5bfad947 100644
--- a/drivers/bluetooth/btuart_cs.c
+++ b/drivers/bluetooth/btuart_cs.c
@@ -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)
--
2.16.2



2018-03-19 11:37:20

by Paul McQuade

[permalink] [raw]
Subject: [PATCH 4/4] Bluetooth: space required

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(-)

diff --git a/drivers/bluetooth/hci_serdev.c b/drivers/bluetooth/hci_serdev.c
index e0e6461b9200..ec4b6b2bbf9a 100644
--- a/drivers/bluetooth/hci_serdev.c
+++ b/drivers/bluetooth/hci_serdev.c
@@ -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);
}
--
2.16.2


2018-03-19 11:38:09

by Paul McQuade

[permalink] [raw]
Subject: [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(-)

diff --git a/drivers/bluetooth/hci_intel.c b/drivers/bluetooth/hci_intel.c
index 7c166e3b308b..2a7bdc0bad92 100644
--- a/drivers/bluetooth/hci_intel.c
+++ b/drivers/bluetooth/hci_intel.c
@@ -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 */
--
2.16.2


2018-03-19 11:57:07

by Paul McQuade

[permalink] [raw]
Subject: [PATCH 3/4] Bluetooth: trailing statements

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(-)

diff --git a/drivers/bluetooth/hci_ll.c b/drivers/bluetooth/hci_ll.c
index 1b4417a623a4..06d859d82de8 100644
--- a/drivers/bluetooth/hci_ll.c
+++ b/drivers/bluetooth/hci_ll.c
@@ -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;
}
--
2.16.2


2018-03-20 08:11:19

by Marcel Holtmann

[permalink] [raw]
Subject: Re: [PATCH 3/4] Bluetooth: trailing statements

Hi Paul,

> 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(-)
>
> diff --git a/drivers/bluetooth/hci_ll.c b/drivers/bluetooth/hci_ll.c
> index 1b4417a623a4..06d859d82de8 100644
> --- a/drivers/bluetooth/hci_ll.c
> +++ b/drivers/bluetooth/hci_ll.c
> @@ -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);

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

Regards

Marcel


2018-03-20 08:12:13

by Marcel Holtmann

[permalink] [raw]
Subject: Re: [PATCH 1/4] Bluetooth: trailing whitespace

Hi Paul,

> 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(-)
>
> diff --git a/drivers/bluetooth/bfusb.c b/drivers/bluetooth/bfusb.c
> index ab090a313a5f..0d5b403fe431 100644
> --- a/drivers/bluetooth/bfusb.c
> +++ b/drivers/bluetooth/bfusb.c
> @@ -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);
> diff --git a/drivers/bluetooth/btuart_cs.c b/drivers/bluetooth/btuart_cs.c
> index 310e9c2e09b6..8dce5bfad947 100644
> --- a/drivers/bluetooth/btuart_cs.c
> +++ b/drivers/bluetooth/btuart_cs.c
> @@ -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