tree-wide: fix assorted typos all over the place

[safe/jmp/linux-2.6] / drivers / char / rocket_int.h

diff --git a/drivers/char/rocket_int.h b/drivers/char/rocket_int.h
index b01d381..67e0f1e 100644 (file)
--- a/drivers/char/rocket_int.h
+++ b/drivers/char/rocket_int.h
@@ -55,7 +55,7 @@ static inline void sOutW(unsigned short port, unsigned short value)
 
 static inline void out32(unsigned short port, Byte_t *p)
 {
-       u32 value = le32_to_cpu(get_unaligned((__le32 *)p));
+       u32 value = get_unaligned_le32(p);
 #ifdef ROCKET_DEBUG_IO
        printk(KERN_DEBUG "out32(%x, %lx)...\n", port, value);
 #endif
@@ -1125,18 +1125,14 @@ Warnings: This function writes the data byte without checking to see if
 
 struct r_port {
        int magic;
+       struct tty_port port;
        int line;
-       int flags;
-       int count;
-       int blocked_open;
-       struct tty_struct *tty;
+       int flags;              /* Don't yet match the ASY_ flags!! */
        unsigned int board:3;
        unsigned int aiop:2;
        unsigned int chan:3;
        CONTROLLER_t *ctlp;
        CHANNEL_t channel;
-       int closing_wait;
-       int close_delay;
        int intmask;
        int xmit_fifo_room;     /* room in xmit fifo */
        unsigned char *xmit_buf;
@@ -1148,8 +1144,7 @@ struct r_port {
        int read_status_mask;
        int cps;
 
-       wait_queue_head_t open_wait;
-       struct completion close_wait;
+       struct completion close_wait;   /* Not yet matching the core */
        spinlock_t slock;
        struct mutex write_mtx;
 };
@@ -1167,11 +1162,6 @@ struct r_port {
 /* number of characters left in xmit buffer before we ask for more */
 #define WAKEUP_CHARS 256
 
-/* Internal flags used only by the rocketport driver */
-#define ROCKET_INITIALIZED     0x80000000      /* Port is active */
-#define ROCKET_CLOSING         0x40000000      /* Serial port is closing */
-#define ROCKET_NORMAL_ACTIVE   0x20000000      /* Normal port is active */
-
 /*
  * Assigned major numbers for the Comtrol Rocketport
  */