Bluetooth: hidp: remove old session-management

We have the full new session-management now available so lets switch over
and remove all the old code. Few semantics changed, so we need to adjust
the sock.c callers a bit. But this mostly simplifies the logic.

Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>

1 files changed, 6 insertions, 15 deletions

diff --git a/net/bluetooth/hidp/sock.c b/net/bluetooth/hidp/sock.c
index e6bf36a0ba40..2f4cbb0865ca 100644
--- a/net/bluetooth/hidp/sock.c
+++ b/net/bluetooth/hidp/sock.c
@@ -77,21 +77,12 @@ static int hidp_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long
                         return err;
                 }
 
-                if (csock->sk->sk_state != BT_CONNECTED ||
-                                isock->sk->sk_state != BT_CONNECTED) {
-                        sockfd_put(csock);
-                        sockfd_put(isock);
-                        return -EBADFD;
-                }
+                err = hidp_connection_add(&ca, csock, isock);
+                if (!err && copy_to_user(argp, &ca, sizeof(ca)))
+                        err = -EFAULT;
 
-                err = hidp_add_connection(&ca, csock, isock);
-                if (!err) {
-                        if (copy_to_user(argp, &ca, sizeof(ca)))
-                                err = -EFAULT;
-                } else {
-                        sockfd_put(csock);
-                        sockfd_put(isock);
-                }
+                sockfd_put(csock);
+                sockfd_put(isock);
 
                 return err;
 
@@ -102,7 +93,7 @@ static int hidp_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long
                 if (copy_from_user(&cd, argp, sizeof(cd)))
                         return -EFAULT;
 
-                return hidp_del_connection(&cd);
+                return hidp_connection_del(&cd);
 
         case HIDPGETCONNLIST:
                 if (copy_from_user(&cl, argp, sizeof(cl)))