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

Bluetooth: Trivial clean ups to SCO 



Remove extra braces and labels, break over column 80 lines, etc

Signed-off-by: default avatarGustavo F. Padovan <padovan@profusion.mobi>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 0d861d8b

net/bluetooth/sco.c

+11 −12
Original line number Diff line number Diff line
@@ -165,11 +165,11 @@ static inline int sco_chan_add(struct sco_conn *conn, struct sock *sk, struct so 
	int err = 0;



	sco_conn_lock(conn);

	if (conn->sk) {

	if (conn->sk)

		err = -EBUSY;

	} else {

	else

		__sco_chan_add(conn, sk, parent);

	}



	sco_conn_unlock(conn);

	return err;

}
@@ -241,21 +241,19 @@ static inline int sco_send_frame(struct sock *sk, struct msghdr *msg, int len) 
	BT_DBG("sk %p len %d", sk, len);



	count = min_t(unsigned int, conn->mtu, len);

	if (!(skb = bt_skb_send_alloc(sk, count, msg->msg_flags & MSG_DONTWAIT, &err)))

	skb = bt_skb_send_alloc(sk, count,

			msg->msg_flags & MSG_DONTWAIT, &err);

	if (!skb)

		return err;



	if (memcpy_fromiovec(skb_put(skb, count), msg->msg_iov, count)) {

		err = -EFAULT;

		goto fail;

		kfree_skb(skb);

		return -EFAULT;

	}



	hci_send_sco(conn->hcon, skb);



	return count;



fail:

	kfree_skb(skb);

	return err;

}



static inline void sco_recv_frame(struct sco_conn *conn, struct sk_buff *skb)
@@ -625,7 +623,7 @@ static int sco_sock_sendmsg(struct kiocb *iocb, struct socket *sock, 
			    struct msghdr *msg, size_t len)

{

	struct sock *sk = sock->sk;

	int err = 0;

	int err;



	BT_DBG("sock %p, sk %p", sock, sk);
@@ -850,7 +848,8 @@ static void sco_conn_ready(struct sco_conn *conn) 


		bh_lock_sock(parent);



		sk = sco_sock_alloc(sock_net(parent), NULL, BTPROTO_SCO, GFP_ATOMIC);

		sk = sco_sock_alloc(sock_net(parent), NULL,

				BTPROTO_SCO, GFP_ATOMIC);

		if (!sk) {

			bh_unlock_sock(parent);

			goto done;