projects / deliverable / linux.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
serial: jsm: Convert jsm_printk to jsm_dbg
[deliverable/linux.git] / drivers / tty / serial / jsm / jsm_tty.c
diff --git a/drivers/tty/serial/jsm/jsm_tty.c b/drivers/tty/serial/jsm/jsm_tty.c
index 71397961773c232413600dd68a69ea7e43d72ec6..7d2c1f3aa36b047187fea991176029c441a14333 100644 (file)
--- a/drivers/tty/serial/jsm/jsm_tty.c
+++ b/drivers/tty/serial/jsm/jsm_tty.c
@@ -43,7 +43,7 @@ static inline int jsm_get_mstat(struct jsm_channel *ch)
        unsigned char mstat;
        unsigned result;
 
-       jsm_printk(IOCTL, INFO, &ch->ch_bd->pci_dev, "start\n");
+       jsm_dbg(IOCTL, &ch->ch_bd->pci_dev, "start\n");
 
        mstat = (ch->ch_mostat | ch->ch_mistat);
 
@@ -62,7 +62,7 @@ static inline int jsm_get_mstat(struct jsm_channel *ch)
        if (mstat & UART_MSR_DCD)
                result |= TIOCM_CD;
 
-       jsm_printk(IOCTL, INFO, &ch->ch_bd->pci_dev, "finish\n");
+       jsm_dbg(IOCTL, &ch->ch_bd->pci_dev, "finish\n");
        return result;
 }
 
@@ -79,14 +79,14 @@ static unsigned int jsm_tty_get_mctrl(struct uart_port *port)
        int result;
        struct jsm_channel *channel = (struct jsm_channel *)port;
 
-       jsm_printk(IOCTL, INFO, &channel->ch_bd->pci_dev, "start\n");
+       jsm_dbg(IOCTL, &channel->ch_bd->pci_dev, "start\n");
 
        result = jsm_get_mstat(channel);
 
        if (result < 0)
                return -ENXIO;
 
-       jsm_printk(IOCTL, INFO, &channel->ch_bd->pci_dev, "finish\n");
+       jsm_dbg(IOCTL, &channel->ch_bd->pci_dev, "finish\n");
 
        return result;
 }
@@ -100,7 +100,7 @@ static void jsm_tty_set_mctrl(struct uart_port *port, unsigned int mctrl)
 {
        struct jsm_channel *channel = (struct jsm_channel *)port;
 
-       jsm_printk(IOCTL, INFO, &channel->ch_bd->pci_dev, "start\n");
+       jsm_dbg(IOCTL, &channel->ch_bd->pci_dev, "start\n");
 
        if (mctrl & TIOCM_RTS)
                channel->ch_mostat |= UART_MCR_RTS;
@@ -114,7 +114,7 @@ static void jsm_tty_set_mctrl(struct uart_port *port, unsigned int mctrl)
 
        channel->ch_bd->bd_ops->assert_modem_signals(channel);
 
-       jsm_printk(IOCTL, INFO, &channel->ch_bd->pci_dev, "finish\n");
+       jsm_dbg(IOCTL, &channel->ch_bd->pci_dev, "finish\n");
        udelay(10);
 }
 
@@ -135,23 +135,23 @@ static void jsm_tty_start_tx(struct uart_port *port)
 {
        struct jsm_channel *channel = (struct jsm_channel *)port;
 
-       jsm_printk(IOCTL, INFO, &channel->ch_bd->pci_dev, "start\n");
+       jsm_dbg(IOCTL, &channel->ch_bd->pci_dev, "start\n");
 
        channel->ch_flags &= ~(CH_STOP);
        jsm_tty_write(port);
 
-       jsm_printk(IOCTL, INFO, &channel->ch_bd->pci_dev, "finish\n");
+       jsm_dbg(IOCTL, &channel->ch_bd->pci_dev, "finish\n");
 }
 
 static void jsm_tty_stop_tx(struct uart_port *port)
 {
        struct jsm_channel *channel = (struct jsm_channel *)port;
 
-       jsm_printk(IOCTL, INFO, &channel->ch_bd->pci_dev, "start\n");
+       jsm_dbg(IOCTL, &channel->ch_bd->pci_dev, "start\n");
 
        channel->ch_flags |= (CH_STOP);
 
-       jsm_printk(IOCTL, INFO, &channel->ch_bd->pci_dev, "finish\n");
+       jsm_dbg(IOCTL, &channel->ch_bd->pci_dev, "finish\n");
 }
 
 static void jsm_tty_send_xchar(struct uart_port *port, char ch)
@@ -216,16 +216,16 @@ static int jsm_tty_open(struct uart_port *port)
        if (!channel->ch_rqueue) {
                channel->ch_rqueue = kzalloc(RQUEUESIZE, GFP_KERNEL);
                if (!channel->ch_rqueue) {
-                       jsm_printk(INIT, ERR, &channel->ch_bd->pci_dev,
-                               "unable to allocate read queue buf");
+                       jsm_dbg(INIT, &channel->ch_bd->pci_dev,
+                               "unable to allocate read queue buf\n");
                        return -ENOMEM;
                }
        }
        if (!channel->ch_equeue) {
                channel->ch_equeue = kzalloc(EQUEUESIZE, GFP_KERNEL);
                if (!channel->ch_equeue) {
-                       jsm_printk(INIT, ERR, &channel->ch_bd->pci_dev,
-                               "unable to allocate error queue buf");
+                       jsm_dbg(INIT, &channel->ch_bd->pci_dev,
+                               "unable to allocate error queue buf\n");
                        return -ENOMEM;
                }
        }
@@ -234,7 +234,7 @@ static int jsm_tty_open(struct uart_port *port)
        /*
         * Initialize if neither terminal is open.
         */
-       jsm_printk(OPEN, INFO, &channel->ch_bd->pci_dev,
+       jsm_dbg(OPEN, &channel->ch_bd->pci_dev,
                "jsm_open: initializing channel in open...\n");
 
        /*
@@ -270,7 +270,7 @@ static int jsm_tty_open(struct uart_port *port)
 
        channel->ch_open_count++;
 
-       jsm_printk(OPEN, INFO, &channel->ch_bd->pci_dev, "finish\n");
+       jsm_dbg(OPEN, &channel->ch_bd->pci_dev, "finish\n");
        return 0;
 }
 
@@ -280,7 +280,7 @@ static void jsm_tty_close(struct uart_port *port)
        struct ktermios *ts;
        struct jsm_channel *channel = (struct jsm_channel *)port;
 
-       jsm_printk(CLOSE, INFO, &channel->ch_bd->pci_dev, "start\n");
+       jsm_dbg(CLOSE, &channel->ch_bd->pci_dev, "start\n");
 
        bd = channel->ch_bd;
        ts = &port->state->port.tty->termios;
@@ -293,7 +293,7 @@ static void jsm_tty_close(struct uart_port *port)
         * If we have HUPCL set, lower DTR and RTS
         */
        if (channel->ch_c_cflag & HUPCL) {
-               jsm_printk(CLOSE, INFO, &channel->ch_bd->pci_dev,
+               jsm_dbg(CLOSE, &channel->ch_bd->pci_dev,
                        "Close. HUPCL set, dropping DTR/RTS\n");
 
                /* Drop RTS/DTR */
@@ -304,7 +304,7 @@ static void jsm_tty_close(struct uart_port *port)
        /* Turn off UART interrupts for this port */
        channel->ch_bd->bd_ops->uart_off(channel);
 
-       jsm_printk(CLOSE, INFO, &channel->ch_bd->pci_dev, "finish\n");
+       jsm_dbg(CLOSE, &channel->ch_bd->pci_dev, "finish\n");
 }
 
 static void jsm_tty_set_termios(struct uart_port *port,
@@ -380,7 +380,7 @@ int __devinit jsm_tty_init(struct jsm_board *brd)
        if (!brd)
                return -ENXIO;
 
-       jsm_printk(INIT, INFO, &brd->pci_dev, "start\n");
+       jsm_dbg(INIT, &brd->pci_dev, "start\n");
 
        /*
         * Initialize board structure elements.
@@ -401,9 +401,9 @@ int __devinit jsm_tty_init(struct jsm_board *brd)
                         */
                        brd->channels[i] = kzalloc(sizeof(struct jsm_channel), GFP_KERNEL);
                        if (!brd->channels[i]) {
-                               jsm_printk(CORE, ERR, &brd->pci_dev,
+                               jsm_dbg(CORE, &brd->pci_dev,
                                        "%s:%d Unable to allocate memory for channel struct\n",
-                                                        __FILE__, __LINE__);
+                                       __FILE__, __LINE__);
                        }
                }
        }
@@ -431,7 +431,7 @@ int __devinit jsm_tty_init(struct jsm_board *brd)
                init_waitqueue_head(&ch->ch_flags_wait);
        }
 
-       jsm_printk(INIT, INFO, &brd->pci_dev, "finish\n");
+       jsm_dbg(INIT, &brd->pci_dev, "finish\n");
        return 0;
 }
 
@@ -444,7 +444,7 @@ int jsm_uart_port_init(struct jsm_board *brd)
        if (!brd)
                return -ENXIO;
 
-       jsm_printk(INIT, INFO, &brd->pci_dev, "start\n");
+       jsm_dbg(INIT, &brd->pci_dev, "start\n");
 
        /*
         * Initialize board structure elements.
@@ -481,7 +481,7 @@ int jsm_uart_port_init(struct jsm_board *brd)
                        printk(KERN_INFO "jsm: Port %d added\n", i);
        }
 
-       jsm_printk(INIT, INFO, &brd->pci_dev, "finish\n");
+       jsm_dbg(INIT, &brd->pci_dev, "finish\n");
        return 0;
 }
 
@@ -493,7 +493,7 @@ int jsm_remove_uart_port(struct jsm_board *brd)
        if (!brd)
                return -ENXIO;
 
-       jsm_printk(INIT, INFO, &brd->pci_dev, "start\n");
+       jsm_dbg(INIT, &brd->pci_dev, "start\n");
 
        /*
         * Initialize board structure elements.
@@ -513,7 +513,7 @@ int jsm_remove_uart_port(struct jsm_board *brd)
                uart_remove_one_port(&jsm_uart_driver, &brd->channels[i]->uart_port);
        }
 
-       jsm_printk(INIT, INFO, &brd->pci_dev, "finish\n");
+       jsm_dbg(INIT, &brd->pci_dev, "finish\n");
        return 0;
 }
 
@@ -531,7 +531,7 @@ void jsm_input(struct jsm_channel *ch)
        int s = 0;
        int i = 0;
 
-       jsm_printk(READ, INFO, &ch->ch_bd->pci_dev, "start\n");
+       jsm_dbg(READ, &ch->ch_bd->pci_dev, "start\n");
 
        if (!ch)
                return;
@@ -560,7 +560,7 @@ void jsm_input(struct jsm_channel *ch)
                return;
        }
 
-       jsm_printk(READ, INFO, &ch->ch_bd->pci_dev, "start\n");
+       jsm_dbg(READ, &ch->ch_bd->pci_dev, "start\n");
 
        /*
         *If the device is not open, or CREAD is off, flush
@@ -569,8 +569,9 @@ void jsm_input(struct jsm_channel *ch)
        if (!tp ||
                !(tp->termios.c_cflag & CREAD) ) {
 
-               jsm_printk(READ, INFO, &ch->ch_bd->pci_dev,
-                       "input. dropping %d bytes on port %d...\n", data_len, ch->ch_portnum);
+               jsm_dbg(READ, &ch->ch_bd->pci_dev,
+                       "input. dropping %d bytes on port %d...\n",
+                       data_len, ch->ch_portnum);
                ch->ch_r_head = tail;
 
                /* Force queue flow control to be released, if needed */
@@ -585,17 +586,17 @@ void jsm_input(struct jsm_channel *ch)
         */
        if (ch->ch_flags & CH_STOPI) {
                spin_unlock_irqrestore(&ch->ch_lock, lock_flags);
-               jsm_printk(READ, INFO, &ch->ch_bd->pci_dev,
+               jsm_dbg(READ, &ch->ch_bd->pci_dev,
                        "Port %d throttled, not reading any data. head: %x tail: %x\n",
                        ch->ch_portnum, head, tail);
                return;
        }
 
-       jsm_printk(READ, INFO, &ch->ch_bd->pci_dev, "start 2\n");
+       jsm_dbg(READ, &ch->ch_bd->pci_dev, "start 2\n");
 
        if (data_len <= 0) {
                spin_unlock_irqrestore(&ch->ch_lock, lock_flags);
-               jsm_printk(READ, INFO, &ch->ch_bd->pci_dev, "jsm_input 1\n");
+               jsm_dbg(READ, &ch->ch_bd->pci_dev, "jsm_input 1\n");
                return;
        }
 
@@ -653,7 +654,7 @@ void jsm_input(struct jsm_channel *ch)
        /* Tell the tty layer its okay to "eat" the data now */
        tty_flip_buffer_push(tp);
 
-       jsm_printk(IOCTL, INFO, &ch->ch_bd->pci_dev, "finish\n");
+       jsm_dbg(IOCTL, &ch->ch_bd->pci_dev, "finish\n");
 }
 
 static void jsm_carrier(struct jsm_channel *ch)
@@ -663,7 +664,7 @@ static void jsm_carrier(struct jsm_channel *ch)
        int virt_carrier = 0;
        int phys_carrier = 0;
 
-       jsm_printk(CARR, INFO, &ch->ch_bd->pci_dev, "start\n");
+       jsm_dbg(CARR, &ch->ch_bd->pci_dev, "start\n");
        if (!ch)
                return;
 
@@ -673,16 +674,16 @@ static void jsm_carrier(struct jsm_channel *ch)
                return;
 
        if (ch->ch_mistat & UART_MSR_DCD) {
-               jsm_printk(CARR, INFO, &ch->ch_bd->pci_dev,
-                       "mistat: %x D_CD: %x\n", ch->ch_mistat, ch->ch_mistat & UART_MSR_DCD);
+               jsm_dbg(CARR, &ch->ch_bd->pci_dev, "mistat: %x D_CD: %x\n",
+                       ch->ch_mistat, ch->ch_mistat & UART_MSR_DCD);
                phys_carrier = 1;
        }
 
        if (ch->ch_c_cflag & CLOCAL)
                virt_carrier = 1;
 
-       jsm_printk(CARR, INFO, &ch->ch_bd->pci_dev,
-               "DCD: physical: %d virt: %d\n", phys_carrier, virt_carrier);
+       jsm_dbg(CARR, &ch->ch_bd->pci_dev, "DCD: physical: %d virt: %d\n",
+               phys_carrier, virt_carrier);
 
        /*
         * Test for a VIRTUAL carrier transition to HIGH.
@@ -694,8 +695,7 @@ static void jsm_carrier(struct jsm_channel *ch)
                 * for carrier in the open routine.
                 */
 
-               jsm_printk(CARR, INFO, &ch->ch_bd->pci_dev,
-                       "carrier: virt DCD rose\n");
+               jsm_dbg(CARR, &ch->ch_bd->pci_dev, "carrier: virt DCD rose\n");
 
                if (waitqueue_active(&(ch->ch_flags_wait)))
                        wake_up_interruptible(&ch->ch_flags_wait);
@@ -711,7 +711,7 @@ static void jsm_carrier(struct jsm_channel *ch)
                 * for carrier in the open routine.
                 */
 
-               jsm_printk(CARR, INFO, &ch->ch_bd->pci_dev,
+               jsm_dbg(CARR, &ch->ch_bd->pci_dev,
                        "carrier: physical DCD rose\n");
 
                if (waitqueue_active(&(ch->ch_flags_wait)))
@@ -790,8 +790,8 @@ void jsm_check_queue_flow_control(struct jsm_channel *ch)
                        if(!(ch->ch_flags & CH_RECEIVER_OFF)) {
                                bd_ops->disable_receiver(ch);
                                ch->ch_flags |= (CH_RECEIVER_OFF);
-                               jsm_printk(READ, INFO, &ch->ch_bd->pci_dev,
-                                       "Internal queue hit hilevel mark (%d)! Turning off interrupts.\n",
+                               jsm_dbg(READ, &ch->ch_bd->pci_dev,
+                                       "Internal queue hit hilevel mark (%d)! Turning off interrupts\n",
                                        qleft);
                        }
                }
@@ -800,8 +800,9 @@ void jsm_check_queue_flow_control(struct jsm_channel *ch)
                        if (ch->ch_stops_sent <= MAX_STOPS_SENT) {
                                bd_ops->send_stop_character(ch);
                                ch->ch_stops_sent++;
-                               jsm_printk(READ, INFO, &ch->ch_bd->pci_dev,
-                                       "Sending stop char! Times sent: %x\n", ch->ch_stops_sent);
+                               jsm_dbg(READ, &ch->ch_bd->pci_dev,
+                                       "Sending stop char! Times sent: %x\n",
+                                       ch->ch_stops_sent);
                        }
                }
        }
@@ -827,8 +828,8 @@ void jsm_check_queue_flow_control(struct jsm_channel *ch)
                        if (ch->ch_flags & CH_RECEIVER_OFF) {
                                bd_ops->enable_receiver(ch);
                                ch->ch_flags &= ~(CH_RECEIVER_OFF);
-                               jsm_printk(READ, INFO, &ch->ch_bd->pci_dev,
-                                       "Internal queue hit lowlevel mark (%d)! Turning on interrupts.\n",
+                               jsm_dbg(READ, &ch->ch_bd->pci_dev,
+                                       "Internal queue hit lowlevel mark (%d)! Turning on interrupts\n",
                                        qleft);
                        }
                }
@@ -836,7 +837,8 @@ void jsm_check_queue_flow_control(struct jsm_channel *ch)
                else if (ch->ch_c_iflag & IXOFF && ch->ch_stops_sent) {
                        ch->ch_stops_sent = 0;
                        bd_ops->send_start_character(ch);
-                       jsm_printk(READ, INFO, &ch->ch_bd->pci_dev, "Sending start char!\n");
+                       jsm_dbg(READ, &ch->ch_bd->pci_dev,
+                               "Sending start char!\n");
                }
        }
 }
Linux kernel - Deliverables
This page took 0.030699 seconds and 5 git commands to generate.