Bluetooth: btmrvl: trivial style fixes

Patch shortens locals scope and adds missing braces. This is a diff
between v1 which was applied and v2 of patch "Bluetooth: btmrvl: Do
not send vendor events to bluetooth stack".

Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>

diff --git a/drivers/bluetooth/btmrvl_main.c b/drivers/bluetooth/btmrvl_main.c
index dc304def8400ca4d38c67c989d1560cea7711303..3a4343b3bd6d0dfeb0ef98370d4e23f89b39f996 100644 (file)
--- a/drivers/bluetooth/btmrvl_main.c
+++ b/drivers/bluetooth/btmrvl_main.c
@@ -47,10 +47,11 @@ EXPORT_SYMBOL_GPL(btmrvl_interrupt);
 bool btmrvl_check_evtpkt(struct btmrvl_private *priv, struct sk_buff *skb)
 {
        struct hci_event_hdr *hdr = (void *) skb->data;
-       struct hci_ev_cmd_complete *ec;
-       u16 opcode, ocf, ogf;
 
        if (hdr->evt == HCI_EV_CMD_COMPLETE) {
+               struct hci_ev_cmd_complete *ec;
+               u16 opcode, ocf, ogf;
+
                ec = (void *) (skb->data + HCI_EVENT_HDR_SIZE);
                opcode = __le16_to_cpu(ec->opcode);
                ocf = hci_opcode_ocf(opcode);
@@ -64,7 +65,8 @@ bool btmrvl_check_evtpkt(struct btmrvl_private *priv, struct sk_buff *skb)
                }
 
                if (ogf == OGF) {
-                       BT_DBG("vendor event skipped: ogf 0x%4.4x", ogf);
+                       BT_DBG("vendor event skipped: ogf 0x%4.4x ocf 0x%4.4x",
+                              ogf, ocf);
                        kfree_skb(skb);
                        return false;
                }

diff --git a/drivers/bluetooth/btmrvl_sdio.c b/drivers/bluetooth/btmrvl_sdio.c
index cf7588edba0d2760a6778589f033953f3ad083fc..6a9e9717d3ab8327da49160823ef136ada65e053 100644 (file)
--- a/drivers/bluetooth/btmrvl_sdio.c
+++ b/drivers/bluetooth/btmrvl_sdio.c
@@ -568,8 +568,9 @@ static int btmrvl_sdio_card_to_host(struct btmrvl_private *priv)
                if (type == HCI_EVENT_PKT) {
                        if (btmrvl_check_evtpkt(priv, skb))
                                hci_recv_frame(skb);
-               } else
+               } else {
                        hci_recv_frame(skb);
+               }
 
                hdev->stat.byte_rx += buf_len;
                break;