Commit c4297e8f authored by Marcel Holtmann's avatar Marcel Holtmann Committed by Johan Hedberg
Browse files

Bluetooth: Fix some obvious coding style issues in the SCO module 



Lets fix this obvious coding style issues in the SCO module and bring it
in line with the rest of the Bluetooth subsystem.

Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
parent 05fcd4c4

net/bluetooth/sco.c

+19 −11
Original line number Diff line number Diff line
@@ -183,7 +183,8 @@ static void sco_conn_del(struct hci_conn *hcon, int err) 
	kfree(conn);

}



static void __sco_chan_add(struct sco_conn *conn, struct sock *sk, struct sock *parent)

static void __sco_chan_add(struct sco_conn *conn, struct sock *sk,

			   struct sock *parent)

{

	BT_DBG("conn %p", conn);
@@ -463,7 +464,8 @@ static struct proto sco_proto = { 
	.obj_size	= sizeof(struct sco_pinfo)

};



static struct sock *sco_sock_alloc(struct net *net, struct socket *sock, int proto, gfp_t prio, int kern)

static struct sock *sco_sock_alloc(struct net *net, struct socket *sock,

				   int proto, gfp_t prio, int kern)

{

	struct sock *sk;
@@ -512,7 +514,8 @@ static int sco_sock_create(struct net *net, struct socket *sock, int protocol, 
	return 0;

}



static int sco_sock_bind(struct socket *sock, struct sockaddr *addr, int addr_len)

static int sco_sock_bind(struct socket *sock, struct sockaddr *addr,

			 int addr_len)

{

	struct sockaddr_sco *sa = (struct sockaddr_sco *) addr;

	struct sock *sk = sock->sk;
@@ -619,7 +622,8 @@ static int sco_sock_listen(struct socket *sock, int backlog) 
	return err;

}



static int sco_sock_accept(struct socket *sock, struct socket *newsock, int flags)

static int sco_sock_accept(struct socket *sock, struct socket *newsock,

			   int flags)

{

	DEFINE_WAIT_FUNC(wait, woken_wake_function);

	struct sock *sk = sock->sk, *ch;
@@ -673,7 +677,8 @@ static int sco_sock_accept(struct socket *sock, struct socket *newsock, int flag 
	return err;

}



static int sco_sock_getname(struct socket *sock, struct sockaddr *addr, int *len, int peer)

static int sco_sock_getname(struct socket *sock, struct sockaddr *addr,

			    int *len, int peer)

{

	struct sockaddr_sco *sa = (struct sockaddr_sco *) addr;

	struct sock *sk = sock->sk;
@@ -783,7 +788,8 @@ static int sco_sock_recvmsg(struct socket *sock, struct msghdr *msg, 
	return bt_sock_recvmsg(sock, msg, len, flags);

}



static int sco_sock_setsockopt(struct socket *sock, int level, int optname, char __user *optval, unsigned int optlen)

static int sco_sock_setsockopt(struct socket *sock, int level, int optname,

			       char __user *optval, unsigned int optlen)

{

	struct sock *sk = sock->sk;

	int len, err = 0;
@@ -847,7 +853,8 @@ static int sco_sock_setsockopt(struct socket *sock, int level, int optname, char 
	return err;

}



static int sco_sock_getsockopt_old(struct socket *sock, int optname, char __user *optval, int __user *optlen)

static int sco_sock_getsockopt_old(struct socket *sock, int optname,

				   char __user *optval, int __user *optlen)

{

	struct sock *sk = sock->sk;

	struct sco_options opts;
@@ -907,7 +914,8 @@ static int sco_sock_getsockopt_old(struct socket *sock, int optname, char __user 
	return err;

}



static int sco_sock_getsockopt(struct socket *sock, int level, int optname, char __user *optval, int __user *optlen)

static int sco_sock_getsockopt(struct socket *sock, int level, int optname,

			       char __user *optval, int __user *optlen)

{

	struct sock *sk = sock->sk;

	int len, err = 0;