serial_core: Commonalize crlf when working w/ a non open console port

[cascardo/linux.git] / drivers / tty / serial / pch_uart.c

diff --git a/drivers/tty/serial/pch_uart.c b/drivers/tty/serial/pch_uart.c
index 0931b3f..0cb6a8e 100644 (file)
--- a/drivers/tty/serial/pch_uart.c
+++ b/drivers/tty/serial/pch_uart.c
@@ -257,6 +257,8 @@ struct eg20t_port {
        dma_addr_t                      rx_buf_dma;
 
        struct dentry   *debugfs;
+#define IRQ_NAME_SIZE 17
+       char                            irq_name[IRQ_NAME_SIZE];
 
        /* protect the eg20t_port private structure and io access to membase */
        spinlock_t lock;
@@ -1343,7 +1345,7 @@ static int pch_uart_startup(struct uart_port *port)
                return ret;
 
        ret = request_irq(priv->port.irq, pch_uart_interrupt, IRQF_SHARED,
-                       KBUILD_MODNAME, priv);
+                       priv->irq_name, priv);
        if (ret < 0)
                return ret;
 
@@ -1588,13 +1590,8 @@ static void pch_uart_put_poll_char(struct uart_port *port,
        wait_for_xmitr(priv, UART_LSR_THRE);
        /*
         * Send the character out.
-        * If a LF, also do CR...
         */
        iowrite8(c, priv->membase + PCH_UART_THR);
-       if (c == 10) {
-               wait_for_xmitr(priv, UART_LSR_THRE);
-               iowrite8(13, priv->membase + PCH_UART_THR);
-       }
 
        /*
         * Finally, wait for transmitter to become empty
@@ -1818,6 +1815,10 @@ static struct eg20t_port *pch_uart_init_port(struct pci_dev *pdev,
        priv->port.line = board->line_no;
        priv->trigger = PCH_UART_HAL_TRIGGER_M;
 
+       snprintf(priv->irq_name, IRQ_NAME_SIZE,
+                KBUILD_MODNAME ":" PCH_UART_DRIVER_DEVICE "%d",
+                priv->port.line);
+
        spin_lock_init(&priv->port.lock);
 
        pci_set_drvdata(pdev, priv);