Bluetooth: Remove unneeded forward declaration of __sco_chan_add
The forward declaration of __sco_chan_add is not needed and thus just remove it. Move __sco_chan_add into the proper location. Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
This commit is contained in:
parent
395365eaf1
commit
015b01cbca
net/bluetooth
|
@ -53,7 +53,6 @@ struct sco_conn {
|
||||||
#define sco_conn_lock(c) spin_lock(&c->lock);
|
#define sco_conn_lock(c) spin_lock(&c->lock);
|
||||||
#define sco_conn_unlock(c) spin_unlock(&c->lock);
|
#define sco_conn_unlock(c) spin_unlock(&c->lock);
|
||||||
|
|
||||||
static void __sco_chan_add(struct sco_conn *conn, struct sock *sk, struct sock *parent);
|
|
||||||
static void sco_chan_del(struct sock *sk, int err);
|
static void sco_chan_del(struct sock *sk, int err);
|
||||||
|
|
||||||
static void sco_sock_close(struct sock *sk);
|
static void sco_sock_close(struct sock *sk);
|
||||||
|
@ -164,6 +163,17 @@ static int sco_conn_del(struct hci_conn *hcon, int err)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void __sco_chan_add(struct sco_conn *conn, struct sock *sk, struct sock *parent)
|
||||||
|
{
|
||||||
|
BT_DBG("conn %p", conn);
|
||||||
|
|
||||||
|
sco_pi(sk)->conn = conn;
|
||||||
|
conn->sk = sk;
|
||||||
|
|
||||||
|
if (parent)
|
||||||
|
bt_accept_enqueue(parent, sk);
|
||||||
|
}
|
||||||
|
|
||||||
static int sco_chan_add(struct sco_conn *conn, struct sock *sk,
|
static int sco_chan_add(struct sco_conn *conn, struct sock *sk,
|
||||||
struct sock *parent)
|
struct sock *parent)
|
||||||
{
|
{
|
||||||
|
@ -968,17 +978,6 @@ static int sco_sock_release(struct socket *sock)
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void __sco_chan_add(struct sco_conn *conn, struct sock *sk, struct sock *parent)
|
|
||||||
{
|
|
||||||
BT_DBG("conn %p", conn);
|
|
||||||
|
|
||||||
sco_pi(sk)->conn = conn;
|
|
||||||
conn->sk = sk;
|
|
||||||
|
|
||||||
if (parent)
|
|
||||||
bt_accept_enqueue(parent, sk);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Delete channel.
|
/* Delete channel.
|
||||||
* Must be called on the locked socket. */
|
* Must be called on the locked socket. */
|
||||||
static void sco_chan_del(struct sock *sk, int err)
|
static void sco_chan_del(struct sock *sk, int err)
|
||||||
|
|
Loading…
Reference in New Issue