Bluetooth: Fix some checkpatch.pl errors and warnings

Signed-off-by: Szymon Janc <szymon.janc@tieto.com>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>

2 files changed, 4 insertions, 7 deletions

diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index cf18f6d1b9a3..e0928bffd8c8 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -1337,14 +1337,12 @@ int hci_blacklist_del(struct hci_dev *hdev, bdaddr_t *bdaddr)
 {
         struct bdaddr_list *entry;
 
-        if (bacmp(bdaddr, BDADDR_ANY) == 0) {
+        if (bacmp(bdaddr, BDADDR_ANY) == 0)
                 return hci_blacklist_clear(hdev);
-        }
 
         entry = hci_blacklist_lookup(hdev, bdaddr);
-        if (!entry) {
+        if (!entry)
                 return -ENOENT;
-        }
 
         list_del(&entry->list);
         kfree(entry);
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index 7c746ec85143..d63e67007c6b 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -97,7 +97,6 @@ static struct l2cap_chan *__l2cap_get_chan_by_dcid(struct l2cap_conn *conn, u16
                         return c;
         }
         return NULL;
-
 }
 
 static struct l2cap_chan *__l2cap_get_chan_by_scid(struct l2cap_conn *conn, u16 cid)
@@ -1901,7 +1900,7 @@ static void l2cap_add_opt_efs(void **ptr, struct l2cap_chan *chan)
 {
         struct l2cap_conf_efs efs;
 
-        switch(chan->mode) {
+        switch (chan->mode) {
         case L2CAP_MODE_ERTM:
                 efs.id          = chan->local_id;
                 efs.stype       = chan->local_stype;
@@ -3014,7 +3013,7 @@ static inline int l2cap_disconnect_rsp(struct l2cap_conn *conn, struct l2cap_cmd
 
         /* don't delete l2cap channel if sk is owned by user */
         if (sock_owned_by_user(sk)) {
-                l2cap_state_change(chan,BT_DISCONN);
+                l2cap_state_change(chan, BT_DISCONN);
                 __clear_chan_timer(chan);
                 __set_chan_timer(chan, L2CAP_DISC_TIMEOUT);
                 bh_unlock_sock(sk);