Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af05b30b authored by Gustavo Padovan's avatar Gustavo Padovan Committed by Marcel Holtmann
Browse files

Bluetooth: Fix errors and warnings in L2CAP reported by checkpatch.pl 



This patch fixes the errors without changing the l2cap.o binary:

 text    data     bss     dec     hex filename
18059     568       0   18627    48c3 l2cap.o.after
18059     568       0   18627    48c3 l2cap.o.before

Signed-off-by: default avatarGustavo F. Padovan <gustavo@las.ic.unicamp.br>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 44d0e48e

net/bluetooth/l2cap.c

+43 −27
Original line number Diff line number Diff line
@@ -40,10 +40,10 @@ 
#include <linux/skbuff.h>

#include <linux/list.h>

#include <linux/device.h>

#include <linux/uaccess.h>

#include <net/sock.h>



#include <asm/system.h>

#include <asm/uaccess.h>

#include <asm/unaligned.h>



#include <net/bluetooth/bluetooth.h>
@@ -134,7 +134,8 @@ static inline struct sock *l2cap_get_chan_by_scid(struct l2cap_chan_list *l, u16 
	struct sock *s;

	read_lock(&l->lock);

	s = __l2cap_get_chan_by_scid(l, cid);

	if (s) bh_lock_sock(s);

	if (s)

		bh_lock_sock(s);

	read_unlock(&l->lock);

	return s;

}
@@ -154,7 +155,8 @@ static inline struct sock *l2cap_get_chan_by_ident(struct l2cap_chan_list *l, u8 
	struct sock *s;

	read_lock(&l->lock);

	s = __l2cap_get_chan_by_ident(l, ident);

	if (s) bh_lock_sock(s);

	if (s)

		bh_lock_sock(s);

	read_unlock(&l->lock);

	return s;

}
@@ -204,7 +206,8 @@ static void __l2cap_chan_add(struct l2cap_conn *conn, struct sock *sk, struct so 
{

	struct l2cap_chan_list *l = &conn->chan_list;



	BT_DBG("conn %p, psm 0x%2.2x, dcid 0x%4.4x", conn, l2cap_pi(sk)->psm, l2cap_pi(sk)->dcid);

	BT_DBG("conn %p, psm 0x%2.2x, dcid 0x%4.4x", conn,

			l2cap_pi(sk)->psm, l2cap_pi(sk)->dcid);



	conn->disc_reason = 0x13;
@@ -588,7 +591,8 @@ static inline struct sock *l2cap_get_sock_by_psm(int state, __le16 psm, bdaddr_t 
	struct sock *s;

	read_lock(&l2cap_sk_list.lock);

	s = __l2cap_get_sock_by_psm(state, psm, src);

	if (s) bh_lock_sock(s);

	if (s)

		bh_lock_sock(s);

	read_unlock(&l2cap_sk_list.lock);

	return s;

}
@@ -849,7 +853,8 @@ static int l2cap_do_connect(struct sock *sk) 
	BT_DBG("%s -> %s psm 0x%2.2x", batostr(src), batostr(dst),

							l2cap_pi(sk)->psm);



	if (!(hdev = hci_get_route(dst, src)))

	hdev = hci_get_route(dst, src);

	if (!hdev)

		return -EHOSTUNREACH;



	hci_dev_lock_bh(hdev);
@@ -975,7 +980,8 @@ static int l2cap_sock_connect(struct socket *sock, struct sockaddr *addr, int al 
	bacpy(&bt_sk(sk)->dst, &la.l2_bdaddr);

	l2cap_pi(sk)->psm = la.l2_psm;



	if ((err = l2cap_do_connect(sk)))

	err = l2cap_do_connect(sk);

	if (err)

		goto done;



wait:
@@ -1167,8 +1173,8 @@ static inline int l2cap_do_send(struct sock *sk, struct msghdr *msg, int len) 


		frag = &(*frag)->next;

	}



	if ((err = hci_send_acl(conn->hcon, skb, 0)) < 0)

	err = hci_send_acl(conn->hcon, skb, 0);

	if (err < 0)

		goto fail;



	return sent;
@@ -1568,8 +1574,8 @@ static void l2cap_raw_recv(struct l2cap_conn *conn, struct sk_buff *skb) 
		/* Don't send frame to the socket it came from */

		if (skb->sk == sk)

			continue;



		if (!(nskb = skb_clone(skb, GFP_ATOMIC)))

		nskb = skb_clone(skb, GFP_ATOMIC);

		if (!nskb)

			continue;



		if (sock_queue_rcv_skb(sk, nskb))
@@ -1587,7 +1593,8 @@ static struct sk_buff *l2cap_build_cmd(struct l2cap_conn *conn, 
	struct l2cap_hdr *lh;

	int len, count;



	BT_DBG("conn %p, code 0x%2.2x, ident 0x%2.2x, len %d", conn, code, ident, dlen);

	BT_DBG("conn %p, code 0x%2.2x, ident 0x%2.2x, len %d",

			conn, code, ident, dlen);



	len = L2CAP_HDR_SIZE + L2CAP_CMD_HDR_SIZE + dlen;

	count = min_t(unsigned int, conn->mtu, len);
@@ -1966,10 +1973,12 @@ static inline int l2cap_connect_rsp(struct l2cap_conn *conn, struct l2cap_cmd_hd 
	BT_DBG("dcid 0x%4.4x scid 0x%4.4x result 0x%2.2x status 0x%2.2x", dcid, scid, result, status);



	if (scid) {

		if (!(sk = l2cap_get_chan_by_scid(&conn->chan_list, scid)))

		sk = l2cap_get_chan_by_scid(&conn->chan_list, scid);

		if (!sk)

			return 0;

	} else {

		if (!(sk = l2cap_get_chan_by_ident(&conn->chan_list, cmd->ident)))

		sk = l2cap_get_chan_by_ident(&conn->chan_list, cmd->ident);

		if (!sk)

			return 0;

	}
@@ -2012,7 +2021,8 @@ static inline int l2cap_config_req(struct l2cap_conn *conn, struct l2cap_cmd_hdr 


	BT_DBG("dcid 0x%4.4x flags 0x%2.2x", dcid, flags);



	if (!(sk = l2cap_get_chan_by_scid(&conn->chan_list, dcid)))

	sk = l2cap_get_chan_by_scid(&conn->chan_list, dcid);

	if (!sk)

		return -ENOENT;



	if (sk->sk_state == BT_DISCONN)
@@ -2079,9 +2089,11 @@ static inline int l2cap_config_rsp(struct l2cap_conn *conn, struct l2cap_cmd_hdr 
	flags  = __le16_to_cpu(rsp->flags);

	result = __le16_to_cpu(rsp->result);



	BT_DBG("scid 0x%4.4x flags 0x%2.2x result 0x%2.2x", scid, flags, result);

	BT_DBG("scid 0x%4.4x flags 0x%2.2x result 0x%2.2x",

			scid, flags, result);



	if (!(sk = l2cap_get_chan_by_scid(&conn->chan_list, scid)))

	sk = l2cap_get_chan_by_scid(&conn->chan_list, scid);

	if (!sk)

		return 0;



	switch (result) {
@@ -2142,7 +2154,8 @@ static inline int l2cap_disconnect_req(struct l2cap_conn *conn, struct l2cap_cmd 


	BT_DBG("scid 0x%4.4x dcid 0x%4.4x", scid, dcid);



	if (!(sk = l2cap_get_chan_by_scid(&conn->chan_list, dcid)))

	sk = l2cap_get_chan_by_scid(&conn->chan_list, dcid);

	if (!sk)

		return 0;



	rsp.dcid = cpu_to_le16(l2cap_pi(sk)->scid);
@@ -2169,7 +2182,8 @@ static inline int l2cap_disconnect_rsp(struct l2cap_conn *conn, struct l2cap_cmd 


	BT_DBG("dcid 0x%4.4x scid 0x%4.4x", dcid, scid);



	if (!(sk = l2cap_get_chan_by_scid(&conn->chan_list, scid)))

	sk = l2cap_get_chan_by_scid(&conn->chan_list, scid);

	if (!sk)

		return 0;



	l2cap_chan_del(sk, 0);
@@ -2403,7 +2417,8 @@ static inline int l2cap_conless_channel(struct l2cap_conn *conn, __le16 psm, str 
	kfree_skb(skb);



done:

	if (sk) bh_unlock_sock(sk);

	if (sk)

		bh_unlock_sock(sk);

	return 0;

}
@@ -2650,7 +2665,8 @@ static int l2cap_recv_acldata(struct hci_conn *hcon, struct sk_buff *skb, u16 fl 
		}



		/* Allocate skb for the complete frame (with header) */

		if (!(conn->rx_skb = bt_skb_alloc(len, GFP_ATOMIC)))

		conn->rx_skb = bt_skb_alloc(len, GFP_ATOMIC);

		if (!conn->rx_skb)

			goto drop;



		skb_copy_from_linear_data(skb, skb_put(conn->rx_skb, skb->len),
@@ -2710,7 +2726,7 @@ static ssize_t l2cap_sysfs_show(struct class *dev, char *buf) 


	read_unlock_bh(&l2cap_sk_list.lock);



	return (str - buf);

	return str - buf;

}



static CLASS_ATTR(l2cap, S_IRUGO, l2cap_sysfs_show, NULL);