Bluetooth: Cleanup formatting and coding style

Fix some warnings and one error reported by checkpatch.pl:
- lines longer than 80 characters are wrapped
- empty lines inserted to separate variable declarations from the actual
  code
- line break inserted after if (...)

Co-developed-by: Thomas Röthenbacher <thomas.roethenbacher@fau.de>
Signed-off-by: Thomas Röthenbacher <thomas.roethenbacher@fau.de>
Signed-off-by: Fabian Schindlatz <fabian.schindlatz@fau.de>
Cc: linux-kernel@i4.cs.fau.de
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

diff --git a/drivers/bluetooth/bpa10x.c b/drivers/bluetooth/bpa10x.c
index a346ccb5450d8cdb43b1c6f0441b80d6c146341f..a0e84538cec88bfb7b80ee0dae4cef69282b589f 100644 (file)
--- a/drivers/bluetooth/bpa10x.c
+++ b/drivers/bluetooth/bpa10x.c
@@ -359,7 +359,8 @@ static int bpa10x_set_diag(struct hci_dev *hdev, bool enable)
        return 0;
 }
 
-static int bpa10x_probe(struct usb_interface *intf, const struct usb_device_id *id)
+static int bpa10x_probe(struct usb_interface *intf,
+                       const struct usb_device_id *id)
 {
        struct bpa10x_data *data;
        struct hci_dev *hdev;

diff --git a/drivers/bluetooth/hci_ll.c b/drivers/bluetooth/hci_ll.c
index 938ba2737b63449364a24c3a189a2d7524b7e3ab..285706618f8add6eb7bb4714f8ba8d65defab88f 100644 (file)
--- a/drivers/bluetooth/hci_ll.c
+++ b/drivers/bluetooth/hci_ll.c
@@ -128,6 +128,7 @@ static int ll_open(struct hci_uart *hu)
 
        if (hu->serdev) {
                struct ll_device *lldev = serdev_device_get_drvdata(hu->serdev);
+
                if (!IS_ERR(lldev->ext_clk))
                        clk_prepare_enable(lldev->ext_clk);
        }
@@ -162,6 +163,7 @@ static int ll_close(struct hci_uart *hu)
 
        if (hu->serdev) {
                struct ll_device *lldev = serdev_device_get_drvdata(hu->serdev);
+
                gpiod_set_value_cansleep(lldev->enable_gpio, 0);
 
                clk_disable_unprepare(lldev->ext_clk);
@@ -227,7 +229,8 @@ static void ll_device_want_to_wakeup(struct hci_uart *hu)
                break;
        default:
                /* any other state is illegal */
-               BT_ERR("received HCILL_WAKE_UP_IND in state %ld", ll->hcill_state);
+               BT_ERR("received HCILL_WAKE_UP_IND in state %ld",
+                      ll->hcill_state);
                break;
        }
 
@@ -256,7 +259,8 @@ static void ll_device_want_to_sleep(struct hci_uart *hu)
 
        /* sanity check */
        if (ll->hcill_state != HCILL_AWAKE)
-               BT_ERR("ERR: HCILL_GO_TO_SLEEP_IND in state %ld", ll->hcill_state);
+               BT_ERR("ERR: HCILL_GO_TO_SLEEP_IND in state %ld",
+                      ll->hcill_state);
 
        /* acknowledge device sleep */
        if (send_hcill_cmd(HCILL_GO_TO_SLEEP_ACK, hu) < 0) {
@@ -289,7 +293,8 @@ static void ll_device_woke_up(struct hci_uart *hu)
 
        /* sanity check */
        if (ll->hcill_state != HCILL_ASLEEP_TO_AWAKE)
-               BT_ERR("received HCILL_WAKE_UP_ACK in state %ld", ll->hcill_state);
+               BT_ERR("received HCILL_WAKE_UP_ACK in state %ld",
+                      ll->hcill_state);
 
        /* send pending packets and change state to HCILL_AWAKE */
        __ll_do_awake(ll);
@@ -338,7 +343,8 @@ static int ll_enqueue(struct hci_uart *hu, struct sk_buff *skb)
                skb_queue_tail(&ll->tx_wait_q, skb);
                break;
        default:
-               BT_ERR("illegal hcill state: %ld (losing packet)", ll->hcill_state);
+               BT_ERR("illegal hcill state: %ld (losing packet)",
+                      ll->hcill_state);
                kfree_skb(skb);
                break;
        }
@@ -438,6 +444,7 @@ static int ll_recv(struct hci_uart *hu, const void *data, int count)
 static struct sk_buff *ll_dequeue(struct hci_uart *hu)
 {
        struct ll_struct *ll = hu->priv;
+
        return skb_dequeue(&ll->txq);
 }
 
@@ -449,7 +456,8 @@ static int read_local_version(struct hci_dev *hdev)
        struct sk_buff *skb;
        struct hci_rp_read_local_version *ver;
 
-       skb = __hci_cmd_sync(hdev, HCI_OP_READ_LOCAL_VERSION, 0, NULL, HCI_INIT_TIMEOUT);
+       skb = __hci_cmd_sync(hdev, HCI_OP_READ_LOCAL_VERSION, 0, NULL,
+                            HCI_INIT_TIMEOUT);
        if (IS_ERR(skb)) {
                bt_dev_err(hdev, "Reading TI version information failed (%ld)",
                           PTR_ERR(skb));
@@ -469,7 +477,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;
 }
@@ -690,7 +699,9 @@ static int hci_ti_probe(struct serdev_device *serdev)
        serdev_device_set_drvdata(serdev, lldev);
        lldev->serdev = hu->serdev = serdev;
 
-       lldev->enable_gpio = devm_gpiod_get_optional(&serdev->dev, "enable", GPIOD_OUT_LOW);
+       lldev->enable_gpio = devm_gpiod_get_optional(&serdev->dev,
+                                                    "enable",
+                                                    GPIOD_OUT_LOW);
        if (IS_ERR(lldev->enable_gpio))
                return PTR_ERR(lldev->enable_gpio);