Merge ../linux-2.6 by hand

15 files changed, 112 insertions, 83 deletions

diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index 4d75cdfa0a0a..afb7ddf200e0 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -2358,13 +2358,10 @@ static int __devexit serial8250_remove(struct device *dev)
         return 0;
 }
 
-static int serial8250_suspend(struct device *dev, pm_message_t state, u32 level)
+static int serial8250_suspend(struct device *dev, pm_message_t state)
 {
         int i;
 
-        if (level != SUSPEND_DISABLE)
-                return 0;
-
         for (i = 0; i < UART_NR; i++) {
                 struct uart_8250_port *up = &serial8250_ports[i];
 
@@ -2375,13 +2372,10 @@ static int serial8250_suspend(struct device *dev, pm_message_t state, u32 level)
         return 0;
 }
 
-static int serial8250_resume(struct device *dev, u32 level)
+static int serial8250_resume(struct device *dev)
 {
         int i;
 
-        if (level != RESUME_ENABLE)
-                return 0;
-
         for (i = 0; i < UART_NR; i++) {
                 struct uart_8250_port *up = &serial8250_ports[i];
 
diff --git a/drivers/serial/8250_gsc.c b/drivers/serial/8250_gsc.c
index 431aa5761a7a..8b4947933d9b 100644
--- a/drivers/serial/8250_gsc.c
+++ b/drivers/serial/8250_gsc.c
@@ -29,7 +29,6 @@
 static int __init 
 serial_init_chip(struct parisc_device *dev)
 {
-        static int serial_line_nr;
         struct uart_port port;
         unsigned long address;
         int err;
@@ -42,12 +41,13 @@ serial_init_chip(struct parisc_device *dev)
                  */
                 if (parisc_parent(dev)->id.hw_type != HPHW_IOA) {
                         printk(KERN_INFO "Serial: device 0x%lx not configured.\n"
-                                "Enable support for Wax, Lasi, Asp or Dino.\n", dev->hpa);
+                                "Enable support for Wax, Lasi, Asp or Dino.\n",
+                                dev->hpa.start);
                 }
                 return -ENODEV;
         }
 
-        address = dev->hpa;
+        address = dev->hpa.start;
         if (dev->id.sversion != 0x8d) {
                 address += 0x800;
         }
diff --git a/drivers/serial/amba-pl010.c b/drivers/serial/amba-pl010.c
index 679e678c7e6a..ddd0307fece2 100644
--- a/drivers/serial/amba-pl010.c
+++ b/drivers/serial/amba-pl010.c
@@ -50,6 +50,7 @@
 
 #include <asm/io.h>
 #include <asm/irq.h>
+#include <asm/hardware.h>
 #include <asm/hardware/amba.h>
 #include <asm/hardware/amba_serial.h>
 
diff --git a/drivers/serial/amba-pl011.c b/drivers/serial/amba-pl011.c
index 1ff629c74750..938d185841c9 100644
--- a/drivers/serial/amba-pl011.c
+++ b/drivers/serial/amba-pl011.c
@@ -50,6 +50,7 @@
 
 #include <asm/io.h>
 #include <asm/irq.h>
+#include <asm/sizes.h>
 #include <asm/hardware/amba.h>
 #include <asm/hardware/clock.h>
 #include <asm/hardware/amba_serial.h>
diff --git a/drivers/serial/clps711x.c b/drivers/serial/clps711x.c
index 87ef368384fb..6a67e8f585b3 100644
--- a/drivers/serial/clps711x.c
+++ b/drivers/serial/clps711x.c
@@ -408,7 +408,11 @@ static struct uart_port clps711x_ports[UART_NR] = {
         {
                 .iobase         = SYSCON1,
                 .irq            = IRQ_UTXINT1, /* IRQ_URXINT1, IRQ_UMSINT */
+#ifdef CONFIG_MP1000_90MHZ
+                .uartclk        = 4515840,
+#else
                 .uartclk        = 3686400,
+#endif
                 .fifosize       = 16,
                 .ops            = &clps711x_pops,
                 .line           = 0,
@@ -417,7 +421,11 @@ static struct uart_port clps711x_ports[UART_NR] = {
         {
                 .iobase         = SYSCON2,
                 .irq            = IRQ_UTXINT2, /* IRQ_URXINT2 */
+#ifdef CONFIG_MP1000_90MHZ
+                .uartclk        = 4515840,
+#else
                 .uartclk        = 3686400,
+#endif
                 .fifosize       = 16,
                 .ops            = &clps711x_pops,
                 .line           = 1,
@@ -551,6 +559,7 @@ console_initcall(clps711xuart_console_init);
 static struct uart_driver clps711x_reg = {
         .driver_name            = "ttyCL",
         .dev_name               = "ttyCL",
+        .devfs_name             = "ttyCL",
         .major                  = SERIAL_CLPS711X_MAJOR,
         .minor                  = SERIAL_CLPS711X_MINOR,
         .nr                     = UART_NR,
diff --git a/drivers/serial/imx.c b/drivers/serial/imx.c
index bdb4e454b8b0..5b3933b0c997 100644
--- a/drivers/serial/imx.c
+++ b/drivers/serial/imx.c
@@ -921,21 +921,21 @@ static struct uart_driver imx_reg = {
         .cons           = IMX_CONSOLE,
 };
 
-static int serial_imx_suspend(struct device *_dev, pm_message_t state, u32 level)
+static int serial_imx_suspend(struct device *_dev, pm_message_t state)
 {
         struct imx_port *sport = dev_get_drvdata(_dev);
 
-        if (sport && level == SUSPEND_DISABLE)
+        if (sport)
                 uart_suspend_port(&imx_reg, &sport->port);
 
         return 0;
 }
 
-static int serial_imx_resume(struct device *_dev, u32 level)
+static int serial_imx_resume(struct device *_dev)
 {
         struct imx_port *sport = dev_get_drvdata(_dev);
 
-        if (sport && level == RESUME_ENABLE)
+        if (sport)
                 uart_resume_port(&imx_reg, &sport->port);
 
         return 0;
diff --git a/drivers/serial/ioc4_serial.c b/drivers/serial/ioc4_serial.c
index f88fdd480685..771676abee60 100644
--- a/drivers/serial/ioc4_serial.c
+++ b/drivers/serial/ioc4_serial.c
@@ -308,6 +308,8 @@ struct ioc4_serial {
 typedef void ioc4_intr_func_f(void *, uint32_t);
 typedef ioc4_intr_func_f *ioc4_intr_func_t;
 
+static unsigned int Num_of_ioc4_cards;
+
 /* defining this will get you LOTS of great debug info */
 //#define DEBUG_INTERRUPTS
 #define DPRINT_CONFIG(_x...)    ;
@@ -317,7 +319,8 @@ typedef ioc4_intr_func_f *ioc4_intr_func_t;
 #define WAKEUP_CHARS    256
 
 /* number of characters we want to transmit to the lower level at a time */
-#define IOC4_MAX_CHARS  128
+#define IOC4_MAX_CHARS  256
+#define IOC4_FIFO_CHARS 255
 
 /* Device name we're using */
 #define DEVICE_NAME     "ttyIOC"
@@ -1038,6 +1041,7 @@ static int inline ioc4_attach_local(struct ioc4_driver_data *idd)
                         return -ENOMEM;
                 }
                 memset(port, 0, sizeof(struct ioc4_port));
+                spin_lock_init(&port->ip_lock);
 
                 /* we need to remember the previous ones, to point back to
                  * them farther down - setting up the ring buffers.
@@ -1691,12 +1695,14 @@ ioc4_change_speed(struct uart_port *the_port,
                 baud = 9600;
 
         if (!the_port->fifosize)
-                the_port->fifosize = IOC4_MAX_CHARS;
+                the_port->fifosize = IOC4_FIFO_CHARS;
         the_port->timeout = ((the_port->fifosize * HZ * bits) / (baud / 10));
         the_port->timeout += HZ / 50;   /* Add .02 seconds of slop */
 
         the_port->ignore_status_mask = N_ALL_INPUT;
 
+        info->tty->low_latency = 1;
+
         if (I_IGNPAR(info->tty))
                 the_port->ignore_status_mask &= ~(N_PARITY_ERROR
                                                 | N_FRAMING_ERROR);
@@ -1742,7 +1748,6 @@ ioc4_change_speed(struct uart_port *the_port,
  */
 static inline int ic4_startup_local(struct uart_port *the_port)
 {
-        int retval = 0;
         struct ioc4_port *port;
         struct uart_info *info;
 
@@ -1754,9 +1759,6 @@ static inline int ic4_startup_local(struct uart_port *the_port)
                 return -1;
 
         info = the_port->info;
-        if (info->flags & UIF_INITIALIZED) {
-                return retval;
-        }
 
         if (info->tty) {
                 set_bit(TTY_IO_ERROR, &info->tty->flags);
@@ -1775,7 +1777,6 @@ static inline int ic4_startup_local(struct uart_port *the_port)
         /* set the speed of the serial port */
         ioc4_change_speed(the_port, info->tty->termios, (struct termios *)0);
 
-        info->flags |= UIF_INITIALIZED;
         return 0;
 }
 
@@ -1785,9 +1786,13 @@ static inline int ic4_startup_local(struct uart_port *the_port)
  */
 static void ioc4_cb_output_lowat(struct ioc4_port *port)
 {
+        unsigned long pflags;
+
         /* ip_lock is set on the call here */
         if (port->ip_port) {
+                spin_lock_irqsave(&port->ip_port->lock, pflags);
                 transmit_chars(port->ip_port);
+                spin_unlock_irqrestore(&port->ip_port->lock, pflags);
         }
 }
 
@@ -2064,8 +2069,7 @@ static inline int do_read(struct uart_port *the_port, unsigned char *buf,
          * available data as long as it returns some.
          */
         /* Re-arm the timer */
-        writel(port->ip_rx_cons | IOC4_SRCIR_ARM,
-                        &port->ip_serial_regs->srcir);
+        writel(port->ip_rx_cons | IOC4_SRCIR_ARM, &port->ip_serial_regs->srcir);
 
         prod_ptr = readl(&port->ip_serial_regs->srpir) & PROD_CONS_MASK;
         cons_ptr = port->ip_rx_cons;
@@ -2299,6 +2303,7 @@ static inline int do_read(struct uart_port *the_port, unsigned char *buf,
         }
         return total;
 }
+
 /**
  * receive_chars - upper level read. Called with ip_lock.
  * @the_port: port to read from
@@ -2307,9 +2312,11 @@ static void receive_chars(struct uart_port *the_port)
 {
         struct tty_struct *tty;
         unsigned char ch[IOC4_MAX_CHARS];
-        int read_count, request_count;
+        int read_count, request_count = IOC4_MAX_CHARS;
         struct uart_icount *icount;
         struct uart_info *info = the_port->info;
+        int flip = 0;
+        unsigned long pflags;
 
         /* Make sure all the pointers are "good" ones */
         if (!info)
@@ -2317,16 +2324,17 @@ static void receive_chars(struct uart_port *the_port)
         if (!info->tty)
                 return;
 
+        spin_lock_irqsave(&the_port->lock, pflags);
         tty = info->tty;
 
-        request_count = TTY_FLIPBUF_SIZE - tty->flip.count - 1;
+        if (request_count > TTY_FLIPBUF_SIZE - tty->flip.count)
+                request_count = TTY_FLIPBUF_SIZE - tty->flip.count;
 
         if (request_count > 0) {
-                if (request_count > IOC4_MAX_CHARS - 2)
-                        request_count = IOC4_MAX_CHARS - 2;
                 icount = &the_port->icount;
                 read_count = do_read(the_port, ch, request_count);
                 if (read_count > 0) {
+                        flip = 1;
                         memcpy(tty->flip.char_buf_ptr, ch, read_count);
                         memset(tty->flip.flag_buf_ptr, TTY_NORMAL, read_count);
                         tty->flip.char_buf_ptr += read_count;
@@ -2335,7 +2343,11 @@ static void receive_chars(struct uart_port *the_port)
                         icount->rx += read_count;
                 }
         }
-        tty_flip_buffer_push(tty);
+
+        spin_unlock_irqrestore(&the_port->lock, pflags);
+
+        if (flip)
+                tty_flip_buffer_push(tty);
 }
 
 /**
@@ -2393,18 +2405,14 @@ static void ic4_shutdown(struct uart_port *the_port)
 
         info = the_port->info;
 
-        if (!(info->flags & UIF_INITIALIZED))
-                return;
-
         wake_up_interruptible(&info->delta_msr_wait);
 
         if (info->tty)
                 set_bit(TTY_IO_ERROR, &info->tty->flags);
 
-        spin_lock_irqsave(&port->ip_lock, port_flags);
+        spin_lock_irqsave(&the_port->lock, port_flags);
         set_notification(port, N_ALL, 0);
-        info->flags &= ~UIF_INITIALIZED;
-        spin_unlock_irqrestore(&port->ip_lock, port_flags);
+        spin_unlock_irqrestore(&the_port->lock, port_flags);
 }
 
 /**
@@ -2463,12 +2471,10 @@ static unsigned int ic4_get_mctrl(struct uart_port *the_port)
 static void ic4_start_tx(struct uart_port *the_port)
 {
         struct ioc4_port *port = get_ioc4_port(the_port);
-        unsigned long flags;
 
         if (port) {
-                spin_lock_irqsave(&port->ip_lock, flags);
-                transmit_chars(the_port);
-                spin_unlock_irqrestore(&port->ip_lock, flags);
+                set_notification(port, N_OUTPUT_LOWAT, 1);
+                enable_intrs(port, port->ip_hooks->intr_tx_mt);
         }
 }
 
@@ -2510,9 +2516,9 @@ static int ic4_startup(struct uart_port *the_port)
         }
 
         /* Start up the serial port */
-        spin_lock_irqsave(&port->ip_lock, port_flags);
+        spin_lock_irqsave(&the_port->lock, port_flags);
         retval = ic4_startup_local(the_port);
-        spin_unlock_irqrestore(&port->ip_lock, port_flags);
+        spin_unlock_irqrestore(&the_port->lock, port_flags);
         return retval;
 }
 
@@ -2527,12 +2533,11 @@ static void
 ic4_set_termios(struct uart_port *the_port,
                 struct termios *termios, struct termios *old_termios)
 {
-        struct ioc4_port *port = get_ioc4_port(the_port);
         unsigned long port_flags;
 
-        spin_lock_irqsave(&port->ip_lock, port_flags);
+        spin_lock_irqsave(&the_port->lock, port_flags);
         ioc4_change_speed(the_port, termios, old_termios);
-        spin_unlock_irqrestore(&port->ip_lock, port_flags);
+        spin_unlock_irqrestore(&the_port->lock, port_flags);
 }
 
 /**
@@ -2607,24 +2612,25 @@ ioc4_serial_core_attach(struct pci_dev *pdev)
                                 __FUNCTION__, (void *)the_port,
                                 (void *)port));
 
-                spin_lock_init(&the_port->lock);
                 /* membase, iobase and mapbase just need to be non-0 */
                 the_port->membase = (unsigned char __iomem *)1;
-                the_port->line = the_port->iobase = ii;
+                the_port->iobase = (pdev->bus->number << 16) |  ii;
+                the_port->line = (Num_of_ioc4_cards << 2) | ii;
                 the_port->mapbase = 1;
                 the_port->type = PORT_16550A;
-                the_port->fifosize = IOC4_MAX_CHARS;
+                the_port->fifosize = IOC4_FIFO_CHARS;
                 the_port->ops = &ioc4_ops;
                 the_port->irq = control->ic_irq;
                 the_port->dev = &pdev->dev;
+                spin_lock_init(&the_port->lock);
                 if (uart_add_one_port(&ioc4_uart, the_port) < 0) {
                         printk(KERN_WARNING
-                                       "%s: unable to add port %d\n",
-                                       __FUNCTION__, the_port->line);
+                           "%s: unable to add port %d bus %d\n",
+                               __FUNCTION__, the_port->line, pdev->bus->number);
                 } else {
                         DPRINT_CONFIG(
-                                    ("IOC4 serial driver port %d irq = %d\n",
-                                       the_port->line, the_port->irq));
+                            ("IOC4 serial port %d irq = %d, bus %d\n",
+                               the_port->line, the_port->irq, pdev->bus->number));
                 }
                 /* all ports are rs232 for now */
                 ioc4_set_proto(port, PROTO_RS232);
@@ -2734,6 +2740,8 @@ ioc4_serial_attach_one(struct ioc4_driver_data *idd)
         if ((ret = ioc4_serial_core_attach(idd->idd_pdev)))
                 goto out4;
 
+        Num_of_ioc4_cards++;
+
         return ret;
 
         /* error exits that give back resources */
diff --git a/drivers/serial/mpc52xx_uart.c b/drivers/serial/mpc52xx_uart.c
index 0585ab27ffde..8a79968f8ce1 100644
--- a/drivers/serial/mpc52xx_uart.c
+++ b/drivers/serial/mpc52xx_uart.c
@@ -781,22 +781,22 @@ mpc52xx_uart_remove(struct device *dev)
 
 #ifdef CONFIG_PM
 static int
-mpc52xx_uart_suspend(struct device *dev, pm_message_t state, u32 level)
+mpc52xx_uart_suspend(struct device *dev, pm_message_t state)
 {
         struct uart_port *port = (struct uart_port *) dev_get_drvdata(dev);
 
-        if (sport && level == SUSPEND_DISABLE)
+        if (sport)
                 uart_suspend_port(&mpc52xx_uart_driver, port);
 
         return 0;
 }
 
 static int
-mpc52xx_uart_resume(struct device *dev, u32 level)
+mpc52xx_uart_resume(struct device *dev)
 {
         struct uart_port *port = (struct uart_port *) dev_get_drvdata(dev);
 
-        if (port && level == RESUME_ENABLE)
+        if (port)
                 uart_resume_port(&mpc52xx_uart_driver, port);
 
         return 0;
diff --git a/drivers/serial/mpsc.c b/drivers/serial/mpsc.c
index efe79b1fd431..aec83f577ce6 100644
--- a/drivers/serial/mpsc.c
+++ b/drivers/serial/mpsc.c
@@ -1100,6 +1100,8 @@ mpsc_start_rx(struct mpsc_port_info *pi)
 {
         pr_debug("mpsc_start_rx[%d]: Starting...\n", pi->port.line);
 
+        /* Issue a Receive Abort to clear any receive errors */
+        writel(MPSC_CHR_2_RA, pi->mpsc_base + MPSC_CHR_2);
         if (pi->rcv_data) {
                 mpsc_enter_hunt(pi);
                 mpsc_sdma_cmd(pi, SDMA_SDCM_ERD);
diff --git a/drivers/serial/mux.c b/drivers/serial/mux.c
index 189064607709..660bae5ba179 100644
--- a/drivers/serial/mux.c
+++ b/drivers/serial/mux.c
@@ -27,6 +27,7 @@
 #include <linux/delay.h> /* for udelay */
 #include <linux/device.h>
 #include <asm/io.h>
+#include <asm/irq.h>
 #include <asm/parisc-device.h>
 
 #ifdef CONFIG_MAGIC_SYSRQ
@@ -444,7 +445,7 @@ static int __init mux_probe(struct parisc_device *dev)
         unsigned long bytecnt;
         struct uart_port *port;
 
-        status = pdc_iodc_read(&bytecnt, dev->hpa, 0, iodc_data, 32);
+        status = pdc_iodc_read(&bytecnt, dev->hpa.start, 0, iodc_data, 32);
         if(status != PDC_OK) {
                 printk(KERN_ERR "Serial mux: Unable to read IODC.\n");
                 return 1;
@@ -469,16 +470,18 @@ static int __init mux_probe(struct parisc_device *dev)
         for(i = 0; i < ports; ++i, ++port_cnt) {
                 port = &mux_ports[port_cnt];
                 port->iobase    = 0;
-                port->mapbase   = dev->hpa + MUX_OFFSET + (i * MUX_LINE_OFFSET);
+                port->mapbase   = dev->hpa.start + MUX_OFFSET +
+                                                (i * MUX_LINE_OFFSET);
                 port->membase   = ioremap(port->mapbase, MUX_LINE_OFFSET);
                 port->iotype    = SERIAL_IO_MEM;
                 port->type      = PORT_MUX;
-                port->irq       = SERIAL_IRQ_NONE;
+                port->irq       = NO_IRQ;
                 port->uartclk   = 0;
                 port->fifosize  = MUX_FIFO_SIZE;
                 port->ops       = &mux_pops;
                 port->flags     = UPF_BOOT_AUTOCONF;
                 port->line      = port_cnt;
+                spin_lock_init(&port->lock);
                 status = uart_add_one_port(&mux_driver, port);
                 BUG_ON(status);
         }
@@ -497,7 +500,7 @@ static struct parisc_device_id mux_tbl[] = {
 MODULE_DEVICE_TABLE(parisc, mux_tbl);
 
 static struct parisc_driver serial_mux_driver = {
-        .name =         "Serial MUX",
+        .name =         "serial_mux",
         .id_table =     mux_tbl,
         .probe =        mux_probe,
 };
diff --git a/drivers/serial/pxa.c b/drivers/serial/pxa.c
index 90c2a86c421b..8cc4cedadd99 100644
--- a/drivers/serial/pxa.c
+++ b/drivers/serial/pxa.c
@@ -358,6 +358,9 @@ static int serial_pxa_startup(struct uart_port *port)
         unsigned long flags;
         int retval;
 
+        if (port->line == 3) /* HWUART */
+                up->mcr |= UART_MCR_AFE;
+        else
         up->mcr = 0;
 
         /*
@@ -481,8 +484,10 @@ serial_pxa_set_termios(struct uart_port *port, struct termios *termios,
 
         if ((up->port.uartclk / quot) < (2400 * 16))
                 fcr = UART_FCR_ENABLE_FIFO | UART_FCR_PXAR1;
-        else
+        else if ((up->port.uartclk / quot) < (230400 * 16))
                 fcr = UART_FCR_ENABLE_FIFO | UART_FCR_PXAR8;
+        else
+                fcr = UART_FCR_ENABLE_FIFO | UART_FCR_PXAR32;
 
         /*
          * Ok, we're now changing the port state.  Do it with
@@ -772,6 +777,20 @@ static struct uart_pxa_port serial_pxa_ports[] = {
                 .ops            = &serial_pxa_pops,
                 .line           = 2,
         },
+  }, {  /* HWUART */
+        .name   = "HWUART",
+        .cken   = CKEN4_HWUART,
+        .port = {
+                .type           = PORT_PXA,
+                .iotype         = UPIO_MEM,
+                .membase        = (void *)&HWUART,
+                .mapbase        = __PREG(HWUART),
+                .irq            = IRQ_HWUART,
+                .uartclk        = 921600 * 16,
+                .fifosize       = 64,
+                .ops            = &serial_pxa_pops,
+                .line           = 3,
+        },
   }
 };
 
@@ -786,21 +805,21 @@ static struct uart_driver serial_pxa_reg = {
         .cons           = PXA_CONSOLE,
 };
 
-static int serial_pxa_suspend(struct device *_dev, pm_message_t state, u32 level)
+static int serial_pxa_suspend(struct device *_dev, pm_message_t state)
 {
         struct uart_pxa_port *sport = dev_get_drvdata(_dev);
 
-        if (sport && level == SUSPEND_DISABLE)
+        if (sport)
                 uart_suspend_port(&serial_pxa_reg, &sport->port);
 
         return 0;
 }
 
-static int serial_pxa_resume(struct device *_dev, u32 level)
+static int serial_pxa_resume(struct device *_dev)
 {
         struct uart_pxa_port *sport = dev_get_drvdata(_dev);
 
-        if (sport && level == RESUME_ENABLE)
+        if (sport)
                 uart_resume_port(&serial_pxa_reg, &sport->port);
 
         return 0;
diff --git a/drivers/serial/s3c2410.c b/drivers/serial/s3c2410.c
index 52692aa345ec..06a17dff1a73 100644
--- a/drivers/serial/s3c2410.c
+++ b/drivers/serial/s3c2410.c
@@ -1134,23 +1134,22 @@ static int s3c24xx_serial_remove(struct device *_dev)
 
 #ifdef CONFIG_PM
 
-static int s3c24xx_serial_suspend(struct device *dev, pm_message_t state,
-                                  u32 level)
+static int s3c24xx_serial_suspend(struct device *dev, pm_message_t state)
 {
         struct uart_port *port = s3c24xx_dev_to_port(dev);
 
-        if (port && level == SUSPEND_DISABLE)
+        if (port)
                 uart_suspend_port(&s3c24xx_uart_drv, port);
 
         return 0;
 }
 
-static int s3c24xx_serial_resume(struct device *dev, u32 level)
+static int s3c24xx_serial_resume(struct device *dev)
 {
         struct uart_port *port = s3c24xx_dev_to_port(dev);
         struct s3c24xx_uart_port *ourport = to_ourport(port);
 
-        if (port && level == RESUME_ENABLE) {
+        if (port) {
                 clk_enable(ourport->clk);
                 s3c24xx_serial_resetport(port, s3c24xx_port_to_cfg(port));
                 clk_disable(ourport->clk);
diff --git a/drivers/serial/sa1100.c b/drivers/serial/sa1100.c
index dd8aed242357..c4a789e6af44 100644
--- a/drivers/serial/sa1100.c
+++ b/drivers/serial/sa1100.c
@@ -834,21 +834,21 @@ static struct uart_driver sa1100_reg = {
         .cons                   = SA1100_CONSOLE,
 };
 
-static int sa1100_serial_suspend(struct device *_dev, pm_message_t state, u32 level)
+static int sa1100_serial_suspend(struct device *_dev, pm_message_t state)
 {
         struct sa1100_port *sport = dev_get_drvdata(_dev);
 
-        if (sport && level == SUSPEND_DISABLE)
+        if (sport)
                 uart_suspend_port(&sa1100_reg, &sport->port);
 
         return 0;
 }
 
-static int sa1100_serial_resume(struct device *_dev, u32 level)
+static int sa1100_serial_resume(struct device *_dev)
 {
         struct sa1100_port *sport = dev_get_drvdata(_dev);
 
-        if (sport && level == RESUME_ENABLE)
+        if (sport)
                 uart_resume_port(&sa1100_reg, &sport->port);
 
         return 0;
diff --git a/drivers/serial/serial_core.c b/drivers/serial/serial_core.c
index 2d8622eef701..401d94a7fe2e 100644
--- a/drivers/serial/serial_core.c
+++ b/drivers/serial/serial_core.c
@@ -147,8 +147,7 @@ static int uart_startup(struct uart_state *state, int init_hw)
          * once we have successfully opened the port.  Also set
          * up the tty->alt_speed kludge
          */
-        if (info->tty)
-                set_bit(TTY_IO_ERROR, &info->tty->flags);
+        set_bit(TTY_IO_ERROR, &info->tty->flags);
 
         if (port->type == PORT_UNKNOWN)
                 return 0;
diff --git a/drivers/serial/vr41xx_siu.c b/drivers/serial/vr41xx_siu.c
index 0c5d65a08f6e..2b623ab0e36e 100644
--- a/drivers/serial/vr41xx_siu.c
+++ b/drivers/serial/vr41xx_siu.c
@@ -976,14 +976,11 @@ static int siu_remove(struct device *dev)
         return 0;
 }
 
-static int siu_suspend(struct device *dev, pm_message_t state, u32 level)
+static int siu_suspend(struct device *dev, pm_message_t state)
 {
         struct uart_port *port;
         int i;
 
-        if (level != SUSPEND_DISABLE)
-                return 0;
-
         for (i = 0; i < siu_uart_driver.nr; i++) {
                 port = &siu_uart_ports[i];
                 if ((port->type == PORT_VR41XX_SIU ||
@@ -995,14 +992,11 @@ static int siu_suspend(struct device *dev, pm_message_t state, u32 level)
         return 0;
 }
 
-static int siu_resume(struct device *dev, u32 level)
+static int siu_resume(struct device *dev)
 {
         struct uart_port *port;
         int i;
 
-        if (level != RESUME_ENABLE)
-                return 0;
-
         for (i = 0; i < siu_uart_driver.nr; i++) {
                 port = &siu_uart_ports[i];
                 if ((port->type == PORT_VR41XX_SIU ||