usb: gadget: functionfs: replace FFS_SETUP_STATUS with an inline function

[pandora-kernel.git] / drivers / usb / gadget / u_fs.h

diff --git a/drivers/usb/gadget/u_fs.h b/drivers/usb/gadget/u_fs.h
index 38012bc..78263cc 100644 (file)
--- a/drivers/usb/gadget/u_fs.h
+++ b/drivers/usb/gadget/u_fs.h
@@ -172,13 +172,12 @@ struct ffs_data {
         *               happens only in ep0 i/o  which is P: mutex
         * + FFS_SETUP_PENDING   -> FFS_SETUP_CANCELLED -- P: ev.waitq.lock
         * + FFS_SETUP_CANCELLED -> FFS_NO_SETUP        -- cmpxchg
+        *
+        * This field should never be accessed directly and instead
+        * ffs_setup_state_clear_cancelled function should be used.
         */
        enum ffs_setup_state            setup_state;
 
-#define FFS_SETUP_STATE(ffs)                                   \
-       ((enum ffs_setup_state)cmpxchg(&(ffs)->setup_state,     \
-                                      FFS_SETUP_CANCELLED, FFS_NO_SETUP))
-
        /* Events & such. */
        struct {
                u8                              types[4];