1 files changed, 19 insertions, 25 deletions

diff --git a/drivers/tty/serial/crisv10.c b/drivers/tty/serial/crisv10.c
index 225123b37f19..1dfba7b779c8 100644
--- a/drivers/tty/serial/crisv10.c
+++ b/drivers/tty/serial/crisv10.c
@@ -258,7 +258,7 @@ static struct e100_serial rs_table[] = {
           .dma_out_enabled = 1,
           .dma_out_nbr = SER0_TX_DMA_NBR,
           .dma_out_irq_nbr = SER0_DMA_TX_IRQ_NBR,
-          .dma_out_irq_flags = IRQF_DISABLED,
+          .dma_out_irq_flags = 0,
           .dma_out_irq_description = "serial 0 dma tr",
 #else
           .dma_out_enabled = 0,
@@ -271,7 +271,7 @@ static struct e100_serial rs_table[] = {
           .dma_in_enabled = 1,
           .dma_in_nbr = SER0_RX_DMA_NBR,
           .dma_in_irq_nbr = SER0_DMA_RX_IRQ_NBR,
-          .dma_in_irq_flags = IRQF_DISABLED,
+          .dma_in_irq_flags = 0,
           .dma_in_irq_description = "serial 0 dma rec",
 #else
           .dma_in_enabled = 0,
@@ -313,7 +313,7 @@ static struct e100_serial rs_table[] = {
           .dma_out_enabled = 1,
           .dma_out_nbr = SER1_TX_DMA_NBR,
           .dma_out_irq_nbr = SER1_DMA_TX_IRQ_NBR,
-          .dma_out_irq_flags = IRQF_DISABLED,
+          .dma_out_irq_flags = 0,
           .dma_out_irq_description = "serial 1 dma tr",
 #else
           .dma_out_enabled = 0,
@@ -326,7 +326,7 @@ static struct e100_serial rs_table[] = {
           .dma_in_enabled = 1,
           .dma_in_nbr = SER1_RX_DMA_NBR,
           .dma_in_irq_nbr = SER1_DMA_RX_IRQ_NBR,
-          .dma_in_irq_flags = IRQF_DISABLED,
+          .dma_in_irq_flags = 0,
           .dma_in_irq_description = "serial 1 dma rec",
 #else
           .dma_in_enabled = 0,
@@ -369,7 +369,7 @@ static struct e100_serial rs_table[] = {
           .dma_out_enabled = 1,
           .dma_out_nbr = SER2_TX_DMA_NBR,
           .dma_out_irq_nbr = SER2_DMA_TX_IRQ_NBR,
-          .dma_out_irq_flags = IRQF_DISABLED,
+          .dma_out_irq_flags = 0,
           .dma_out_irq_description = "serial 2 dma tr",
 #else
           .dma_out_enabled = 0,
@@ -382,7 +382,7 @@ static struct e100_serial rs_table[] = {
           .dma_in_enabled = 1,
           .dma_in_nbr = SER2_RX_DMA_NBR,
           .dma_in_irq_nbr = SER2_DMA_RX_IRQ_NBR,
-          .dma_in_irq_flags = IRQF_DISABLED,
+          .dma_in_irq_flags = 0,
           .dma_in_irq_description = "serial 2 dma rec",
 #else
           .dma_in_enabled = 0,
@@ -423,7 +423,7 @@ static struct e100_serial rs_table[] = {
           .dma_out_enabled = 1,
           .dma_out_nbr = SER3_TX_DMA_NBR,
           .dma_out_irq_nbr = SER3_DMA_TX_IRQ_NBR,
-          .dma_out_irq_flags = IRQF_DISABLED,
+          .dma_out_irq_flags = 0,
           .dma_out_irq_description = "serial 3 dma tr",
 #else
           .dma_out_enabled = 0,
@@ -436,7 +436,7 @@ static struct e100_serial rs_table[] = {
           .dma_in_enabled = 1,
           .dma_in_nbr = SER3_RX_DMA_NBR,
           .dma_in_irq_nbr = SER3_DMA_RX_IRQ_NBR,
-          .dma_in_irq_flags = IRQF_DISABLED,
+          .dma_in_irq_flags = 0,
           .dma_in_irq_description = "serial 3 dma rec",
 #else
           .dma_in_enabled = 0,
@@ -1788,7 +1788,7 @@ static unsigned int handle_descr_data(struct e100_serial *info,
         struct etrax_recv_buffer *buffer = phys_to_virt(descr->buf) - sizeof *buffer;
 
         if (info->recv_cnt + recvl > 65536) {
-                printk(KERN_CRIT
+                printk(KERN_WARNING
                        "%s: Too much pending incoming serial data! Dropping %u bytes.\n", __func__, recvl);
                 return 0;
         }
@@ -3234,9 +3234,8 @@ rs_write(struct tty_struct *tty,
                 e100_disable_rx(info);
                 e100_enable_rx_irq(info);
 #endif
-                if ((info->rs485.flags & SER_RS485_RTS_BEFORE_SEND) &&
-                        (info->rs485.delay_rts_before_send > 0))
-                                msleep(info->rs485.delay_rts_before_send);
+                if (info->rs485.delay_rts_before_send > 0)
+                        msleep(info->rs485.delay_rts_before_send);
         }
 #endif /* CONFIG_ETRAX_RS485 */
 
@@ -3693,10 +3692,6 @@ rs_ioctl(struct tty_struct *tty,
 
                 rs485data.delay_rts_before_send = rs485ctrl.delay_rts_before_send;
                 rs485data.flags = 0;
-                if (rs485data.delay_rts_before_send != 0)
-                        rs485data.flags |= SER_RS485_RTS_BEFORE_SEND;
-                else
-                        rs485data.flags &= ~(SER_RS485_RTS_BEFORE_SEND);
 
                 if (rs485ctrl.enabled)
                         rs485data.flags |= SER_RS485_ENABLED;
@@ -3813,13 +3808,13 @@ rs_close(struct tty_struct *tty, struct file * filp)
                  * one, we've got real problems, since it means the
                  * serial port won't be shutdown.
                  */
-                printk(KERN_CRIT
+                printk(KERN_ERR
                        "rs_close: bad serial port count; tty->count is 1, "
                        "info->count is %d\n", info->count);
                 info->count = 1;
         }
         if (--info->count < 0) {
-                printk(KERN_CRIT "rs_close: bad serial port count for ttyS%d: %d\n",
+                printk(KERN_ERR "rs_close: bad serial port count for ttyS%d: %d\n",
                        info->line, info->count);
                 info->count = 0;
         }
@@ -4450,18 +4445,18 @@ static int __init rs_init(void)
 
 #if defined(CONFIG_ETRAX_RS485)
 #if defined(CONFIG_ETRAX_RS485_ON_PA)
-        if (cris_io_interface_allocate_pins(if_ser0, 'a', rs485_pa_bit,
+        if (cris_io_interface_allocate_pins(if_serial_0, 'a', rs485_pa_bit,
                         rs485_pa_bit)) {
-                printk(KERN_CRIT "ETRAX100LX serial: Could not allocate "
+                printk(KERN_ERR "ETRAX100LX serial: Could not allocate "
                         "RS485 pin\n");
                 put_tty_driver(driver);
                 return -EBUSY;
         }
 #endif
 #if defined(CONFIG_ETRAX_RS485_ON_PORT_G)
-        if (cris_io_interface_allocate_pins(if_ser0, 'g', rs485_pa_bit,
+        if (cris_io_interface_allocate_pins(if_serial_0, 'g', rs485_pa_bit,
                         rs485_port_g_bit)) {
-                printk(KERN_CRIT "ETRAX100LX serial: Could not allocate "
+                printk(KERN_ERR "ETRAX100LX serial: Could not allocate "
                         "RS485 pin\n");
                 put_tty_driver(driver);
                 return -EBUSY;
@@ -4494,7 +4489,7 @@ static int __init rs_init(void)
                 if (info->enabled) {
                         if (cris_request_io_interface(info->io_if,
                                         info->io_if_description)) {
-                                printk(KERN_CRIT "ETRAX100LX async serial: "
+                                printk(KERN_ERR "ETRAX100LX async serial: "
                                         "Could not allocate IO pins for "
                                         "%s, port %d\n",
                                         info->io_if_description, i);
@@ -4531,7 +4526,6 @@ static int __init rs_init(void)
                 /* Set sane defaults */
                 info->rs485.flags &= ~(SER_RS485_RTS_ON_SEND);
                 info->rs485.flags |= SER_RS485_RTS_AFTER_SEND;
-                info->rs485.flags &= ~(SER_RS485_RTS_BEFORE_SEND);
                 info->rs485.delay_rts_before_send = 0;
                 info->rs485.flags &= ~(SER_RS485_ENABLED);
 #endif
@@ -4558,7 +4552,7 @@ static int __init rs_init(void)
         /* hook the irq's for DMA channel 6 and 7, serial output and input, and some more... */
 
         if (request_irq(SERIAL_IRQ_NBR, ser_interrupt,
-                        IRQF_SHARED | IRQF_DISABLED, "serial ", driver))
+                        IRQF_SHARED, "serial ", driver))
                 panic("%s: Failed to request irq8", __func__);
 
 #endif