Merge branch 'work.compat' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-2.6-microblaze.git] / net / bluetooth / hidp / core.c

diff --git a/net/bluetooth/hidp/core.c b/net/bluetooth/hidp/core.c
index 253975c..a442e21 100644 (file)
--- a/net/bluetooth/hidp/core.c
+++ b/net/bluetooth/hidp/core.c
@@ -649,7 +649,7 @@ static void hidp_process_transmit(struct hidp_session *session,
 }
 
 static int hidp_setup_input(struct hidp_session *session,
-                               struct hidp_connadd_req *req)
+                               const struct hidp_connadd_req *req)
 {
        struct input_dev *input;
        int i;
@@ -748,7 +748,7 @@ EXPORT_SYMBOL_GPL(hidp_hid_driver);
 /* This function sets up the hid device. It does not add it
    to the HID system. That is done in hidp_add_connection(). */
 static int hidp_setup_hid(struct hidp_session *session,
-                               struct hidp_connadd_req *req)
+                               const struct hidp_connadd_req *req)
 {
        struct hid_device *hid;
        int err;
@@ -807,7 +807,7 @@ fault:
 
 /* initialize session devices */
 static int hidp_session_dev_init(struct hidp_session *session,
-                                struct hidp_connadd_req *req)
+                                const struct hidp_connadd_req *req)
 {
        int ret;
 
@@ -906,7 +906,7 @@ static void hidp_session_dev_work(struct work_struct *work)
 static int hidp_session_new(struct hidp_session **out, const bdaddr_t *bdaddr,
                            struct socket *ctrl_sock,
                            struct socket *intr_sock,
-                           struct hidp_connadd_req *req,
+                           const struct hidp_connadd_req *req,
                            struct l2cap_conn *conn)
 {
        struct hidp_session *session;
@@ -1074,6 +1074,10 @@ static int hidp_session_start_sync(struct hidp_session *session)
 static void hidp_session_terminate(struct hidp_session *session)
 {
        atomic_inc(&session->terminate);
+       /*
+        * See the comment preceding the call to wait_woken()
+        * in hidp_session_run().
+        */
        wake_up_interruptible(&hidp_session_wq);
 }
 
@@ -1193,8 +1197,6 @@ static void hidp_session_run(struct hidp_session *session)
                 *    thread is woken up by ->sk_state_changed().
                 */
 
-               /* Ensure session->terminate is updated */
-               smp_mb__before_atomic();
                if (atomic_read(&session->terminate))
                        break;
 
@@ -1228,14 +1230,15 @@ static void hidp_session_run(struct hidp_session *session)
                hidp_process_transmit(session, &session->ctrl_transmit,
                                      session->ctrl_sock);
 
+               /*
+                * wait_woken() performs the necessary memory barriers
+                * for us; see the header comment for this primitive.
+                */
                wait_woken(&wait, TASK_INTERRUPTIBLE, MAX_SCHEDULE_TIMEOUT);
        }
        remove_wait_queue(&hidp_session_wq, &wait);
 
        atomic_inc(&session->terminate);
-
-       /* Ensure session->terminate is updated */
-       smp_mb__after_atomic();
 }
 
 static int hidp_session_wake_function(wait_queue_entry_t *wait,
@@ -1335,7 +1338,7 @@ static int hidp_verify_sockets(struct socket *ctrl_sock,
        return 0;
 }
 
-int hidp_connection_add(struct hidp_connadd_req *req,
+int hidp_connection_add(const struct hidp_connadd_req *req,
                        struct socket *ctrl_sock,
                        struct socket *intr_sock)
 {