RISC-V: Correctly print supported extensions

[platform/kernel/linux-starfive.git] / net / bluetooth / 6lowpan.c

diff --git a/net/bluetooth/6lowpan.c b/net/bluetooth/6lowpan.c
index 97617d0..fd164a2 100644 (file)
--- a/net/bluetooth/6lowpan.c
+++ b/net/bluetooth/6lowpan.c
@@ -103,34 +103,6 @@ static inline bool peer_del(struct lowpan_btle_dev *dev,
        return false;
 }
 
-static inline struct lowpan_peer *peer_lookup_ba(struct lowpan_btle_dev *dev,
-                                                bdaddr_t *ba, __u8 type)
-{
-       struct lowpan_peer *peer;
-
-       BT_DBG("peers %d addr %pMR type %d", atomic_read(&dev->peer_count),
-              ba, type);
-
-       rcu_read_lock();
-
-       list_for_each_entry_rcu(peer, &dev->peers, list) {
-               BT_DBG("dst addr %pMR dst type %d",
-                      &peer->chan->dst, peer->chan->dst_type);
-
-               if (bacmp(&peer->chan->dst, ba))
-                       continue;
-
-               if (type == peer->chan->dst_type) {
-                       rcu_read_unlock();
-                       return peer;
-               }
-       }
-
-       rcu_read_unlock();
-
-       return NULL;
-}
-
 static inline struct lowpan_peer *
 __peer_lookup_chan(struct lowpan_btle_dev *dev, struct l2cap_chan *chan)
 {
@@ -195,7 +167,7 @@ static inline struct lowpan_peer *peer_lookup_dst(struct lowpan_btle_dev *dev,
        rcu_read_lock();
 
        list_for_each_entry_rcu(peer, &dev->peers, list) {
-               BT_DBG("dst addr %pMR dst type %d ip %pI6c",
+               BT_DBG("dst addr %pMR dst type %u ip %pI6c",
                       &peer->chan->dst, peer->chan->dst_type,
                       &peer->peer_addr);
 
@@ -506,7 +478,7 @@ static int send_mcast_pkt(struct sk_buff *skb, struct net_device *netdev)
 
                        local_skb = skb_clone(skb, GFP_ATOMIC);
 
-                       BT_DBG("xmit %s to %pMR type %d IP %pI6c chan %p",
+                       BT_DBG("xmit %s to %pMR type %u IP %pI6c chan %p",
                               netdev->name,
                               &pentry->chan->dst, pentry->chan->dst_type,
                               &pentry->peer_addr, pentry->chan);
@@ -549,7 +521,7 @@ static netdev_tx_t bt_xmit(struct sk_buff *skb, struct net_device *netdev)
 
        if (err) {
                if (lowpan_cb(skb)->chan) {
-                       BT_DBG("xmit %s to %pMR type %d IP %pI6c chan %p",
+                       BT_DBG("xmit %s to %pMR type %u IP %pI6c chan %p",
                               netdev->name, &addr, addr_type,
                               &lowpan_cb(skb)->addr, lowpan_cb(skb)->chan);
                        err = send_pkt(lowpan_cb(skb)->chan, skb, netdev);
@@ -691,7 +663,7 @@ static struct l2cap_chan *add_peer_chan(struct l2cap_chan *chan,
 static int setup_netdev(struct l2cap_chan *chan, struct lowpan_btle_dev **dev)
 {
        struct net_device *netdev;
-       int err = 0;
+       int err;
 
        netdev = alloc_netdev(LOWPAN_PRIV_SIZE(sizeof(struct lowpan_btle_dev)),
                              IFACE_NAME_TEMPLATE, NET_NAME_UNKNOWN,
@@ -818,7 +790,7 @@ static void chan_close_cb(struct l2cap_chan *chan)
 
                        BT_DBG("dev %p removing %speer %p", dev,
                               last ? "last " : "1 ", peer);
-                       BT_DBG("chan %p orig refcnt %d", chan,
+                       BT_DBG("chan %p orig refcnt %u", chan,
                               kref_read(&chan->kref));
 
                        l2cap_chan_put(chan);
@@ -907,14 +879,6 @@ static const struct l2cap_ops bt_6lowpan_chan_ops = {
        .set_shutdown           = l2cap_chan_no_set_shutdown,
 };
 
-static inline __u8 bdaddr_type(__u8 type)
-{
-       if (type == ADDR_LE_DEV_PUBLIC)
-               return BDADDR_LE_PUBLIC;
-       else
-               return BDADDR_LE_RANDOM;
-}
-
 static int bt_6lowpan_connect(bdaddr_t *addr, u8 dst_type)
 {
        struct l2cap_chan *chan;
@@ -940,7 +904,7 @@ static int bt_6lowpan_disconnect(struct l2cap_conn *conn, u8 dst_type)
 {
        struct lowpan_peer *peer;
 
-       BT_DBG("conn %p dst type %d", conn, dst_type);
+       BT_DBG("conn %p dst type %u", conn, dst_type);
 
        peer = lookup_peer(conn);
        if (!peer)
@@ -972,7 +936,7 @@ static struct l2cap_chan *bt_6lowpan_listen(void)
 
        atomic_set(&chan->nesting, L2CAP_NESTING_PARENT);
 
-       BT_DBG("chan %p src type %d", chan, chan->src_type);
+       BT_DBG("chan %p src type %u", chan, chan->src_type);
 
        err = l2cap_add_psm(chan, addr, cpu_to_le16(L2CAP_PSM_IPSP));
        if (err) {
@@ -1013,7 +977,7 @@ static int get_l2cap_conn(char *buf, bdaddr_t *addr, u8 *addr_type,
 
        *conn = (struct l2cap_conn *)hcon->l2cap_data;
 
-       BT_DBG("conn %p dst %pMR type %d", *conn, &hcon->dst, hcon->dst_type);
+       BT_DBG("conn %p dst %pMR type %u", *conn, &hcon->dst, hcon->dst_type);
 
        return 0;
 }
@@ -1155,7 +1119,7 @@ static ssize_t lowpan_control_write(struct file *fp,
                                return -EALREADY;
                        }
 
-                       BT_DBG("conn %p dst %pMR type %d user %d", conn,
+                       BT_DBG("conn %p dst %pMR type %d user %u", conn,
                               &conn->hcon->dst, conn->hcon->dst_type,
                               addr_type);
                }