TTY: serialP, remove DECLARE_WAITQUEUE check
authorJiri Slaby <jslaby@suse.cz>
Mon, 5 Mar 2012 13:52:00 +0000 (14:52 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 8 Mar 2012 19:42:21 +0000 (11:42 -0800)
The macro is always defined now. This was there only for historical
reasons.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
include/linux/serialP.h

index e811a615f696c9ad35114b4067d67c6d31344edc..ec27b34bbbd6f485037945630965c8870883c687 100644 (file)
@@ -79,15 +79,9 @@ struct async_struct {
        int                     io_type;
        struct work_struct                      work;
        struct tasklet_struct   tlet;
-#ifdef DECLARE_WAITQUEUE
        wait_queue_head_t       open_wait;
        wait_queue_head_t       close_wait;
        wait_queue_head_t       delta_msr_wait;
-#else  
-       struct wait_queue       *open_wait;
-       struct wait_queue       *close_wait;
-       struct wait_queue       *delta_msr_wait;
-#endif 
        struct async_struct     *next_port; /* For the linked list */
        struct async_struct     *prev_port;
 };