3 files changed, 3 insertions, 24 deletions

diff --git a/net/nfc/llcp.h b/net/nfc/llcp.h
index ff8c434f7df8..ac16ebe3069d 100644
--- a/net/nfc/llcp.h
+++ b/net/nfc/llcp.h
@@ -246,7 +246,6 @@ struct nfc_llcp_sdp_tlv *nfc_llcp_build_sdreq_tlv(u8 tid, char *uri,
 void nfc_llcp_free_sdp_tlv(struct nfc_llcp_sdp_tlv *sdp);
 void nfc_llcp_free_sdp_tlv_list(struct hlist_head *sdp_head);
 void nfc_llcp_recv(void *data, struct sk_buff *skb, int err);
-int nfc_llcp_disconnect(struct nfc_llcp_sock *sock);
 int nfc_llcp_send_symm(struct nfc_dev *dev);
 int nfc_llcp_send_connect(struct nfc_llcp_sock *sock);
 int nfc_llcp_send_cc(struct nfc_llcp_sock *sock);
diff --git a/net/nfc/llcp_commands.c b/net/nfc/llcp_commands.c
index c1b23eef83ca..1017894807c0 100644
--- a/net/nfc/llcp_commands.c
+++ b/net/nfc/llcp_commands.c
@@ -339,7 +339,7 @@ static struct sk_buff *llcp_allocate_pdu(struct nfc_llcp_sock *sock,
         return skb;
 }
 
-int nfc_llcp_disconnect(struct nfc_llcp_sock *sock)
+int nfc_llcp_send_disconnect(struct nfc_llcp_sock *sock)
 {
         struct sk_buff *skb;
         struct nfc_dev *dev;
@@ -630,26 +630,6 @@ int nfc_llcp_send_dm(struct nfc_llcp_local *local, u8 ssap, u8 dsap, u8 reason)
         return 0;
 }
 
-int nfc_llcp_send_disconnect(struct nfc_llcp_sock *sock)
-{
-        struct sk_buff *skb;
-        struct nfc_llcp_local *local;
-
-        pr_debug("Send DISC\n");
-
-        local = sock->local;
-        if (local == NULL)
-                return -ENODEV;
-
-        skb = llcp_allocate_pdu(sock, LLCP_PDU_DISC, 0);
-        if (skb == NULL)
-                return -ENOMEM;
-
-        skb_queue_head(&local->tx_queue, skb);
-
-        return 0;
-}
-
 int nfc_llcp_send_i_frame(struct nfc_llcp_sock *sock,
                           struct msghdr *msg, size_t len)
 {
diff --git a/net/nfc/llcp_sock.c b/net/nfc/llcp_sock.c
index 380253eccb74..03fd3162cee5 100644
--- a/net/nfc/llcp_sock.c
+++ b/net/nfc/llcp_sock.c
@@ -603,7 +603,7 @@ static int llcp_sock_release(struct socket *sock)
 
         /* Send a DISC */
         if (sk->sk_state == LLCP_CONNECTED)
-                nfc_llcp_disconnect(llcp_sock);
+                nfc_llcp_send_disconnect(llcp_sock);
 
         if (sk->sk_state == LLCP_LISTEN) {
                 struct nfc_llcp_sock *lsk, *n;
@@ -614,7 +614,7 @@ static int llcp_sock_release(struct socket *sock)
                         accept_sk = &lsk->sk;
                         lock_sock(accept_sk);
 
-                        nfc_llcp_disconnect(lsk);
+                        nfc_llcp_send_disconnect(lsk);
                         nfc_llcp_accept_unlink(accept_sk);
 
                         release_sock(accept_sk);