Char: moxa, merge 2 poll functions

- merge 2 timers into one -- one can handle the emptywait as good as the other
- merge 2 separated poll functions into one, this allows handle the actions
  directly and simplifies the code

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Tested-by: Oyvind Aabling <Oyvind.Aabling@uni-c.dk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/char/moxa.h b/drivers/char/moxa.h
index 49e926dea195..0b1650621a04 100644
--- a/drivers/char/moxa.h
+++ b/drivers/char/moxa.h
@@ -165,11 +165,11 @@
 #define HostStat        0x08    /* IRQ flag and general flag      */
 #define FlagStat        0x0A
 #define FlowControl     0x0C    /* B7 B6 B5 B4 B3 B2 B1 B0              */
-                                        /*  x  x  x  x  |  |  |  |            */
-                                        /*              |  |  |  + CTS flow   */
-                                        /*              |  |  +--- RTS flow   */
-                                        /*              |  +------ TX Xon/Xoff */
-                                        /*              +--------- RX Xon/Xoff */
+                                /*  x  x  x  x  |  |  |  |            */
+                                /*              |  |  |  + CTS flow   */
+                                /*              |  |  +--- RTS flow   */
+                                /*              |  +------ TX Xon/Xoff */
+                                /*              +--------- RX Xon/Xoff */
 #define Break_cnt       0x0E    /* received break count   */
 #define CD180TXirq      0x10    /* if non-0: enable TX irq        */
 #define RX_mask         0x12