TTY: serial/m32r_sio, remove debug macros

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

diff --git a/drivers/tty/serial/m32r_sio.c b/drivers/tty/serial/m32r_sio.c
index 0eeb64f..6b13035 100644 (file)
--- a/drivers/tty/serial/m32r_sio.c
+++ b/drivers/tty/serial/m32r_sio.c
@@ -47,59 +47,26 @@
 #define BAUD_RATE      115200
 
 #include <linux/serial_core.h>
-#include "m32r_sio.h"
 #include "m32r_sio_reg.h"
 
-/*
- * Debugging.
- */
-#if 0
-#define DEBUG_AUTOCONF(fmt...) printk(fmt)
-#else
-#define DEBUG_AUTOCONF(fmt...) do { } while (0)
-#endif
-
-#if 0
-#define DEBUG_INTR(fmt...)     printk(fmt)
-#else
-#define DEBUG_INTR(fmt...)     do { } while (0)
-#endif
-
 #define PASS_LIMIT     256
 
-#define BASE_BAUD      115200
-
 /* Standard COM flags */
 #define STD_COM_FLAGS (UPF_BOOT_AUTOCONF | UPF_SKIP_TEST)
 
-/*
- * SERIAL_PORT_DFNS tells us about built-in ports that have no
- * standard enumeration mechanism.   Platforms that can find all
- * serial ports via mechanisms like ACPI or PCI need not supply it.
- */
+static const struct {
+       unsigned int port;
+       unsigned int irq;
+} old_serial_port[] = {
 #if defined(CONFIG_PLAT_USRV)
-
-#define SERIAL_PORT_DFNS                                               \
-       /* UART  CLK     PORT   IRQ            FLAGS */                 \
-       { 0, BASE_BAUD, 0x3F8, PLD_IRQ_UART0, STD_COM_FLAGS }, /* ttyS0 */ \
-       { 0, BASE_BAUD, 0x2F8, PLD_IRQ_UART1, STD_COM_FLAGS }, /* ttyS1 */
-
-#else /* !CONFIG_PLAT_USRV */
-
-#if defined(CONFIG_SERIAL_M32R_PLDSIO)
-#define SERIAL_PORT_DFNS                                               \
-       { 0, BASE_BAUD, ((unsigned long)PLD_ESIO0CR), PLD_IRQ_SIO0_RCV, \
-         STD_COM_FLAGS }, /* ttyS0 */
+       /* PORT  IRQ            FLAGS */
+       { 0x3F8, PLD_IRQ_UART0 }, /* ttyS0 */
+       { 0x2F8, PLD_IRQ_UART1 }, /* ttyS1 */
+#elif defined(CONFIG_SERIAL_M32R_PLDSIO)
+       { ((unsigned long)PLD_ESIO0CR), PLD_IRQ_SIO0_RCV }, /* ttyS0 */
 #else
-#define SERIAL_PORT_DFNS                                               \
-       { 0, BASE_BAUD, M32R_SIO_OFFSET, M32R_IRQ_SIO0_R,               \
-         STD_COM_FLAGS }, /* ttyS0 */
+       { M32R_SIO_OFFSET, M32R_IRQ_SIO0_R }, /* ttyS0 */
 #endif
-
-#endif /* !CONFIG_PLAT_USRV */
-
-static struct old_serial_port old_serial_port[] = {
-       SERIAL_PORT_DFNS
 };
 
 #define UART_NR        ARRAY_SIZE(old_serial_port)
@@ -352,7 +319,7 @@ static void receive_chars(struct uart_sio_port *up, int *status)
                        }
 
                        if (*status & UART_LSR_BI) {
-                               DEBUG_INTR("handling break....");
+                               pr_debug("handling break....\n");
                                flag = TTY_BREAK;
                        } else if (*status & UART_LSR_PE)
                                flag = TTY_PARITY;
@@ -413,7 +380,7 @@ static void transmit_chars(struct uart_sio_port *up)
        if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
                uart_write_wakeup(&up->port);
 
-       DEBUG_INTR("THRE...");
+       pr_debug("THRE...\n");
 
        if (uart_circ_empty(xmit))
                m32r_sio_stop_tx(&up->port);
@@ -425,7 +392,7 @@ static void transmit_chars(struct uart_sio_port *up)
 static inline void m32r_sio_handle_port(struct uart_sio_port *up,
        unsigned int status)
 {
-       DEBUG_INTR("status = %x...", status);
+       pr_debug("status = %x...\n", status);
 
        if (status & 0x04)
                receive_chars(up, &status);
@@ -453,7 +420,7 @@ static irqreturn_t m32r_sio_interrupt(int irq, void *dev_id)
        struct list_head *l, *end = NULL;
        int pass_counter = 0;
 
-       DEBUG_INTR("m32r_sio_interrupt(%d)...", irq);
+       pr_debug("m32r_sio_interrupt(%d)...\n", irq);
 
 #ifdef CONFIG_SERIAL_M32R_PLDSIO
 //     if (irq == PLD_IRQ_SIO0_SND)
@@ -493,7 +460,7 @@ static irqreturn_t m32r_sio_interrupt(int irq, void *dev_id)
 
        spin_unlock(&i->lock);
 
-       DEBUG_INTR("end.\n");
+       pr_debug("end.\n");
 
        return IRQ_HANDLED;
 }
@@ -951,15 +918,14 @@ static void __init m32r_sio_init_ports(void)
                return;
        first = 0;
 
-       for (i = 0, up = m32r_sio_ports; i < ARRAY_SIZE(old_serial_port);
-            i++, up++) {
+       for (i = 0, up = m32r_sio_ports; i < UART_NR; i++, up++) {
                up->port.iobase   = old_serial_port[i].port;
                up->port.irq      = irq_canonicalize(old_serial_port[i].irq);
-               up->port.uartclk  = old_serial_port[i].baud_base * 16;
-               up->port.flags    = old_serial_port[i].flags;
-               up->port.membase  = old_serial_port[i].iomem_base;
-               up->port.iotype   = old_serial_port[i].io_type;
-               up->port.regshift = old_serial_port[i].iomem_reg_shift;
+               up->port.uartclk  = BAUD_RATE * 16;
+               up->port.flags    = STD_COM_FLAGS;
+               up->port.membase  = 0;
+               up->port.iotype   = 0;
+               up->port.regshift = 0;
                up->port.ops      = &m32r_sio_pops;
        }
 }
@@ -1112,28 +1078,6 @@ static struct uart_driver m32r_sio_reg = {
        .cons                   = M32R_SIO_CONSOLE,
 };
 
-/**
- *     m32r_sio_suspend_port - suspend one serial port
- *     @line: serial line number
- *
- *     Suspend one serial port.
- */
-void m32r_sio_suspend_port(int line)
-{
-       uart_suspend_port(&m32r_sio_reg, &m32r_sio_ports[line].port);
-}
-
-/**
- *     m32r_sio_resume_port - resume one serial port
- *     @line: serial line number
- *
- *     Resume one serial port.
- */
-void m32r_sio_resume_port(int line)
-{
-       uart_resume_port(&m32r_sio_reg, &m32r_sio_ports[line].port);
-}
-
 static int __init m32r_sio_init(void)
 {
        int ret, i;
@@ -1163,8 +1107,5 @@ static void __exit m32r_sio_exit(void)
 module_init(m32r_sio_init);
 module_exit(m32r_sio_exit);
 
-EXPORT_SYMBOL(m32r_sio_suspend_port);
-EXPORT_SYMBOL(m32r_sio_resume_port);
-
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("Generic M32R SIO serial driver");