public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-18 22:14:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

serial: jsm: Convert jsm_printk to jsm_dbg

Browse source 
These printks should all be emitted at KERN_DEBUG level.
Make them dependent on CONFIG_DEBUG or (#define DEBUG)
simplify the code a bit.

Add missing newlines where appropriate.

Most all of these messages could be deleted too.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Joe Perches 2012-10-28 03:48:57 -07:00 • committed by Greg Kroah-Hartman
parent d2ffc740f3
commit 669fef4644
4 changed files with 120 additions and 109 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/tty/serial/jsm/jsm.h
View file

@ -57,9 +57,11 @@ enum {
DBG_CARR = 0x10000, DBG_CARR = 0x10000,
}; };
#define jsm_printk(nlevel, klevel, pdev, fmt, args...) \ #define jsm_dbg(nlevel, pdev, fmt, ...) \
if ((DBG_##nlevel & jsm_debug)) \ do { \
dev_printk(KERN_##klevel, pdev->dev, fmt, ## args) if (DBG_##nlevel & jsm_debug) \
dev_dbg(pdev->dev, fmt, ##__VA_ARGS__); \
} while (0)
#define MAXLINES 256 #define MAXLINES 256
#define MAXPORTS 8 #define MAXPORTS 8

3
drivers/tty/serial/jsm/jsm_driver.c
View file

@ -107,8 +107,7 @@ static int __devinit jsm_probe_one(struct pci_dev *pdev, const struct pci_device
brd->irq = pdev->irq; brd->irq = pdev->irq;
jsm_printk(INIT, INFO, &brd->pci_dev, jsm_dbg(INIT, &brd->pci_dev, "jsm_found_board - NEO adapter\n");
"jsm_found_board - NEO adapter\n");
/* get the PCI Base Address Registers */ /* get the PCI Base Address Registers */
brd->membase = pci_resource_start(pdev, 0); brd->membase = pci_resource_start(pdev, 0);

116
drivers/tty/serial/jsm/jsm_neo.c
View file

@ -52,7 +52,7 @@ static void neo_set_cts_flow_control(struct jsm_channel *ch)
ier = readb(&ch->ch_neo_uart->ier); ier = readb(&ch->ch_neo_uart->ier);
efr = readb(&ch->ch_neo_uart->efr); efr = readb(&ch->ch_neo_uart->efr);
jsm_printk(PARAM, INFO, &ch->ch_bd->pci_dev, "Setting CTSFLOW\n"); jsm_dbg(PARAM, &ch->ch_bd->pci_dev, "Setting CTSFLOW\n");
/* Turn on auto CTS flow control */ /* Turn on auto CTS flow control */
ier |= (UART_17158_IER_CTSDSR); ier |= (UART_17158_IER_CTSDSR);
@ -83,7 +83,7 @@ static void neo_set_rts_flow_control(struct jsm_channel *ch)
ier = readb(&ch->ch_neo_uart->ier); ier = readb(&ch->ch_neo_uart->ier);
efr = readb(&ch->ch_neo_uart->efr); efr = readb(&ch->ch_neo_uart->efr);
jsm_printk(PARAM, INFO, &ch->ch_bd->pci_dev, "Setting RTSFLOW\n"); jsm_dbg(PARAM, &ch->ch_bd->pci_dev, "Setting RTSFLOW\n");
/* Turn on auto RTS flow control */ /* Turn on auto RTS flow control */
ier |= (UART_17158_IER_RTSDTR); ier |= (UART_17158_IER_RTSDTR);
@ -123,7 +123,7 @@ static void neo_set_ixon_flow_control(struct jsm_channel *ch)
ier = readb(&ch->ch_neo_uart->ier); ier = readb(&ch->ch_neo_uart->ier);
efr = readb(&ch->ch_neo_uart->efr); efr = readb(&ch->ch_neo_uart->efr);
jsm_printk(PARAM, INFO, &ch->ch_bd->pci_dev, "Setting IXON FLOW\n"); jsm_dbg(PARAM, &ch->ch_bd->pci_dev, "Setting IXON FLOW\n");
/* Turn off auto CTS flow control */ /* Turn off auto CTS flow control */
ier &= ~(UART_17158_IER_CTSDSR); ier &= ~(UART_17158_IER_CTSDSR);
@ -160,7 +160,7 @@ static void neo_set_ixoff_flow_control(struct jsm_channel *ch)
ier = readb(&ch->ch_neo_uart->ier); ier = readb(&ch->ch_neo_uart->ier);
efr = readb(&ch->ch_neo_uart->efr); efr = readb(&ch->ch_neo_uart->efr);
jsm_printk(PARAM, INFO, &ch->ch_bd->pci_dev, "Setting IXOFF FLOW\n"); jsm_dbg(PARAM, &ch->ch_bd->pci_dev, "Setting IXOFF FLOW\n");
/* Turn off auto RTS flow control */ /* Turn off auto RTS flow control */
ier &= ~(UART_17158_IER_RTSDTR); ier &= ~(UART_17158_IER_RTSDTR);
@ -198,7 +198,7 @@ static void neo_set_no_input_flow_control(struct jsm_channel *ch)
ier = readb(&ch->ch_neo_uart->ier); ier = readb(&ch->ch_neo_uart->ier);
efr = readb(&ch->ch_neo_uart->efr); efr = readb(&ch->ch_neo_uart->efr);
jsm_printk(PARAM, INFO, &ch->ch_bd->pci_dev, "Unsetting Input FLOW\n"); jsm_dbg(PARAM, &ch->ch_bd->pci_dev, "Unsetting Input FLOW\n");
/* Turn off auto RTS flow control */ /* Turn off auto RTS flow control */
ier &= ~(UART_17158_IER_RTSDTR); ier &= ~(UART_17158_IER_RTSDTR);
@ -237,7 +237,7 @@ static void neo_set_no_output_flow_control(struct jsm_channel *ch)
ier = readb(&ch->ch_neo_uart->ier); ier = readb(&ch->ch_neo_uart->ier);
efr = readb(&ch->ch_neo_uart->efr); efr = readb(&ch->ch_neo_uart->efr);
jsm_printk(PARAM, INFO, &ch->ch_bd->pci_dev, "Unsetting Output FLOW\n"); jsm_dbg(PARAM, &ch->ch_bd->pci_dev, "Unsetting Output FLOW\n");
/* Turn off auto CTS flow control */ /* Turn off auto CTS flow control */
ier &= ~(UART_17158_IER_CTSDSR); ier &= ~(UART_17158_IER_CTSDSR);
@ -276,7 +276,7 @@ static inline void neo_set_new_start_stop_chars(struct jsm_channel *ch)
if (ch->ch_c_cflag & CRTSCTS) if (ch->ch_c_cflag & CRTSCTS)
return; return;
jsm_printk(PARAM, INFO, &ch->ch_bd->pci_dev, "start\n"); jsm_dbg(PARAM, &ch->ch_bd->pci_dev, "start\n");
/* Tell UART what start/stop chars it should be looking for */ /* Tell UART what start/stop chars it should be looking for */
writeb(ch->ch_startc, &ch->ch_neo_uart->xonchar1); writeb(ch->ch_startc, &ch->ch_neo_uart->xonchar1);
@ -455,7 +455,7 @@ static void neo_copy_data_from_uart_to_queue(struct jsm_channel *ch)
* I hope thats okay with everyone? Yes? Good. * I hope thats okay with everyone? Yes? Good.
*/ */
while (qleft < 1) { while (qleft < 1) {
jsm_printk(READ, INFO, &ch->ch_bd->pci_dev, jsm_dbg(READ, &ch->ch_bd->pci_dev,
"Queue full, dropping DATA:%x LSR:%x\n", "Queue full, dropping DATA:%x LSR:%x\n",
ch->ch_rqueue[tail], ch->ch_equeue[tail]); ch->ch_rqueue[tail], ch->ch_equeue[tail]);
@ -467,8 +467,8 @@ static void neo_copy_data_from_uart_to_queue(struct jsm_channel *ch)
memcpy_fromio(ch->ch_rqueue + head, &ch->ch_neo_uart->txrxburst, 1); memcpy_fromio(ch->ch_rqueue + head, &ch->ch_neo_uart->txrxburst, 1);
ch->ch_equeue[head] = (u8) linestatus; ch->ch_equeue[head] = (u8) linestatus;
jsm_printk(READ, INFO, &ch->ch_bd->pci_dev, jsm_dbg(READ, &ch->ch_bd->pci_dev, "DATA/LSR pair: %x %x\n",
"DATA/LSR pair: %x %x\n", ch->ch_rqueue[head], ch->ch_equeue[head]); ch->ch_rqueue[head], ch->ch_equeue[head]);
/* Ditch any remaining linestatus value. */ /* Ditch any remaining linestatus value. */
linestatus = 0; linestatus = 0;
@ -521,8 +521,8 @@ static void neo_copy_data_from_queue_to_uart(struct jsm_channel *ch)
ch->ch_cached_lsr &= ~(UART_LSR_THRE); ch->ch_cached_lsr &= ~(UART_LSR_THRE);
writeb(circ->buf[circ->tail], &ch->ch_neo_uart->txrx); writeb(circ->buf[circ->tail], &ch->ch_neo_uart->txrx);
jsm_printk(WRITE, INFO, &ch->ch_bd->pci_dev, jsm_dbg(WRITE, &ch->ch_bd->pci_dev,
"Tx data: %x\n", circ->buf[circ->tail]); "Tx data: %x\n", circ->buf[circ->tail]);
circ->tail = (circ->tail + 1) & (UART_XMIT_SIZE - 1); circ->tail = (circ->tail + 1) & (UART_XMIT_SIZE - 1);
ch->ch_txcount++; ch->ch_txcount++;
} }
@ -575,8 +575,9 @@ static void neo_parse_modem(struct jsm_channel *ch, u8 signals)
{ {
u8 msignals = signals; u8 msignals = signals;
jsm_printk(MSIGS, INFO, &ch->ch_bd->pci_dev, jsm_dbg(MSIGS, &ch->ch_bd->pci_dev,
"neo_parse_modem: port: %d msignals: %x\n", ch->ch_portnum, msignals); "neo_parse_modem: port: %d msignals: %x\n",
ch->ch_portnum, msignals);
/* Scrub off lower bits. They signify delta's, which I don't care about */ /* Scrub off lower bits. They signify delta's, which I don't care about */
/* Keep DDCD and DDSR though */ /* Keep DDCD and DDSR though */
@ -606,8 +607,8 @@ static void neo_parse_modem(struct jsm_channel *ch, u8 signals)
else else
ch->ch_mistat &= ~UART_MSR_CTS; ch->ch_mistat &= ~UART_MSR_CTS;
jsm_printk(MSIGS, INFO, &ch->ch_bd->pci_dev, jsm_dbg(MSIGS, &ch->ch_bd->pci_dev,
"Port: %d DTR: %d RTS: %d CTS: %d DSR: %d " "RI: %d CD: %d\n", "Port: %d DTR: %d RTS: %d CTS: %d DSR: %d " "RI: %d CD: %d\n",
ch->ch_portnum, ch->ch_portnum,
!!((ch->ch_mistat | ch->ch_mostat) & UART_MCR_DTR), !!((ch->ch_mistat | ch->ch_mostat) & UART_MCR_DTR),
!!((ch->ch_mistat | ch->ch_mostat) & UART_MCR_RTS), !!((ch->ch_mistat | ch->ch_mostat) & UART_MCR_RTS),
@ -649,8 +650,8 @@ static void neo_flush_uart_write(struct jsm_channel *ch)
/* Check to see if the UART feels it completely flushed the FIFO. */ /* Check to see if the UART feels it completely flushed the FIFO. */
tmp = readb(&ch->ch_neo_uart->isr_fcr); tmp = readb(&ch->ch_neo_uart->isr_fcr);
if (tmp & 4) { if (tmp & 4) {
jsm_printk(IOCTL, INFO, &ch->ch_bd->pci_dev, jsm_dbg(IOCTL, &ch->ch_bd->pci_dev,
"Still flushing TX UART... i: %d\n", i); "Still flushing TX UART... i: %d\n", i);
udelay(10); udelay(10);
} }
else else
@ -681,8 +682,8 @@ static void neo_flush_uart_read(struct jsm_channel *ch)
/* Check to see if the UART feels it completely flushed the FIFO. */ /* Check to see if the UART feels it completely flushed the FIFO. */
tmp = readb(&ch->ch_neo_uart->isr_fcr); tmp = readb(&ch->ch_neo_uart->isr_fcr);
if (tmp & 2) { if (tmp & 2) {
jsm_printk(IOCTL, INFO, &ch->ch_bd->pci_dev, jsm_dbg(IOCTL, &ch->ch_bd->pci_dev,
"Still flushing RX UART... i: %d\n", i); "Still flushing RX UART... i: %d\n", i);
udelay(10); udelay(10);
} }
else else
@ -705,8 +706,9 @@ static void neo_clear_break(struct jsm_channel *ch, int force)
writeb((temp & ~UART_LCR_SBC), &ch->ch_neo_uart->lcr); writeb((temp & ~UART_LCR_SBC), &ch->ch_neo_uart->lcr);
ch->ch_flags &= ~(CH_BREAK_SENDING); ch->ch_flags &= ~(CH_BREAK_SENDING);
jsm_printk(IOCTL, INFO, &ch->ch_bd->pci_dev, jsm_dbg(IOCTL, &ch->ch_bd->pci_dev,
"clear break Finishing UART_LCR_SBC! finished: %lx\n", jiffies); "clear break Finishing UART_LCR_SBC! finished: %lx\n",
jiffies);
/* flush write operation */ /* flush write operation */
neo_pci_posting_flush(ch->ch_bd); neo_pci_posting_flush(ch->ch_bd);
@ -748,8 +750,8 @@ static inline void neo_parse_isr(struct jsm_board *brd, u32 port)
*/ */
isr &= ~(UART_17158_IIR_FIFO_ENABLED); isr &= ~(UART_17158_IIR_FIFO_ENABLED);
jsm_printk(INTR, INFO, &ch->ch_bd->pci_dev, jsm_dbg(INTR, &ch->ch_bd->pci_dev, "%s:%d isr: %x\n",
"%s:%d isr: %x\n", __FILE__, __LINE__, isr); __FILE__, __LINE__, isr);
if (isr & (UART_17158_IIR_RDI_TIMEOUT | UART_IIR_RDI)) { if (isr & (UART_17158_IIR_RDI_TIMEOUT | UART_IIR_RDI)) {
/* Read data from uart -> queue */ /* Read data from uart -> queue */
@ -772,8 +774,9 @@ static inline void neo_parse_isr(struct jsm_board *brd, u32 port)
if (isr & UART_17158_IIR_XONXOFF) { if (isr & UART_17158_IIR_XONXOFF) {
cause = readb(&ch->ch_neo_uart->xoffchar1); cause = readb(&ch->ch_neo_uart->xoffchar1);
jsm_printk(INTR, INFO, &ch->ch_bd->pci_dev, jsm_dbg(INTR, &ch->ch_bd->pci_dev,
"Port %d. Got ISR_XONXOFF: cause:%x\n", port, cause); "Port %d. Got ISR_XONXOFF: cause:%x\n",
port, cause);
/* /*
* Since the UART detected either an XON or * Since the UART detected either an XON or
@ -786,17 +789,19 @@ static inline void neo_parse_isr(struct jsm_board *brd, u32 port)
if (brd->channels[port]->ch_flags & CH_STOP) { if (brd->channels[port]->ch_flags & CH_STOP) {
ch->ch_flags &= ~(CH_STOP); ch->ch_flags &= ~(CH_STOP);
} }
jsm_printk(INTR, INFO, &ch->ch_bd->pci_dev, jsm_dbg(INTR, &ch->ch_bd->pci_dev,
"Port %d. XON detected in incoming data\n", port); "Port %d. XON detected in incoming data\n",
port);
} }
else if (cause == UART_17158_XOFF_DETECT) { else if (cause == UART_17158_XOFF_DETECT) {
if (!(brd->channels[port]->ch_flags & CH_STOP)) { if (!(brd->channels[port]->ch_flags & CH_STOP)) {
ch->ch_flags |= CH_STOP; ch->ch_flags |= CH_STOP;
jsm_printk(INTR, INFO, &ch->ch_bd->pci_dev, jsm_dbg(INTR, &ch->ch_bd->pci_dev,
"Setting CH_STOP\n"); "Setting CH_STOP\n");
} }
jsm_printk(INTR, INFO, &ch->ch_bd->pci_dev, jsm_dbg(INTR, &ch->ch_bd->pci_dev,
"Port: %d. XOFF detected in incoming data\n", port); "Port: %d. XOFF detected in incoming data\n",
port);
} }
spin_unlock_irqrestore(&ch->ch_lock, lock_flags); spin_unlock_irqrestore(&ch->ch_lock, lock_flags);
} }
@ -825,8 +830,8 @@ static inline void neo_parse_isr(struct jsm_board *brd, u32 port)
} }
/* Parse any modem signal changes */ /* Parse any modem signal changes */
jsm_printk(INTR, INFO, &ch->ch_bd->pci_dev, jsm_dbg(INTR, &ch->ch_bd->pci_dev,
"MOD_STAT: sending to parse_modem_sigs\n"); "MOD_STAT: sending to parse_modem_sigs\n");
neo_parse_modem(ch, readb(&ch->ch_neo_uart->msr)); neo_parse_modem(ch, readb(&ch->ch_neo_uart->msr));
} }
} }
@ -849,8 +854,8 @@ static inline void neo_parse_lsr(struct jsm_board *brd, u32 port)
linestatus = readb(&ch->ch_neo_uart->lsr); linestatus = readb(&ch->ch_neo_uart->lsr);
jsm_printk(INTR, INFO, &ch->ch_bd->pci_dev, jsm_dbg(INTR, &ch->ch_bd->pci_dev, "%s:%d port: %d linestatus: %x\n",
"%s:%d port: %d linestatus: %x\n", __FILE__, __LINE__, port, linestatus); __FILE__, __LINE__, port, linestatus);
ch->ch_cached_lsr |= linestatus; ch->ch_cached_lsr |= linestatus;
@ -869,7 +874,7 @@ static inline void neo_parse_lsr(struct jsm_board *brd, u32 port)
*to do the special RX+LSR read for this FIFO load. *to do the special RX+LSR read for this FIFO load.
*/ */
if (linestatus & UART_17158_RX_FIFO_DATA_ERROR) if (linestatus & UART_17158_RX_FIFO_DATA_ERROR)
jsm_printk(INTR, DEBUG, &ch->ch_bd->pci_dev, jsm_dbg(INTR, &ch->ch_bd->pci_dev,
"%s:%d Port: %d Got an RX error, need to parse LSR\n", "%s:%d Port: %d Got an RX error, need to parse LSR\n",
__FILE__, __LINE__, port); __FILE__, __LINE__, port);
@ -880,20 +885,21 @@ static inline void neo_parse_lsr(struct jsm_board *brd, u32 port)
if (linestatus & UART_LSR_PE) { if (linestatus & UART_LSR_PE) {
ch->ch_err_parity++; ch->ch_err_parity++;
jsm_printk(INTR, DEBUG, &ch->ch_bd->pci_dev, jsm_dbg(INTR, &ch->ch_bd->pci_dev, "%s:%d Port: %d. PAR ERR!\n",
"%s:%d Port: %d. PAR ERR!\n", __FILE__, __LINE__, port); __FILE__, __LINE__, port);
} }
if (linestatus & UART_LSR_FE) { if (linestatus & UART_LSR_FE) {
ch->ch_err_frame++; ch->ch_err_frame++;
jsm_printk(INTR, DEBUG, &ch->ch_bd->pci_dev, jsm_dbg(INTR, &ch->ch_bd->pci_dev, "%s:%d Port: %d. FRM ERR!\n",
"%s:%d Port: %d. FRM ERR!\n", __FILE__, __LINE__, port); __FILE__, __LINE__, port);
} }
if (linestatus & UART_LSR_BI) { if (linestatus & UART_LSR_BI) {
ch->ch_err_break++; ch->ch_err_break++;
jsm_printk(INTR, DEBUG, &ch->ch_bd->pci_dev, jsm_dbg(INTR, &ch->ch_bd->pci_dev,
"%s:%d Port: %d. BRK INTR!\n", __FILE__, __LINE__, port); "%s:%d Port: %d. BRK INTR!\n",
__FILE__, __LINE__, port);
} }
if (linestatus & UART_LSR_OE) { if (linestatus & UART_LSR_OE) {
@ -904,8 +910,9 @@ static inline void neo_parse_lsr(struct jsm_board *brd, u32 port)
* Probably we should eventually have an orun stat in our driver... * Probably we should eventually have an orun stat in our driver...
*/ */
ch->ch_err_overrun++; ch->ch_err_overrun++;
jsm_printk(INTR, DEBUG, &ch->ch_bd->pci_dev, jsm_dbg(INTR, &ch->ch_bd->pci_dev,
"%s:%d Port: %d. Rx Overrun!\n", __FILE__, __LINE__, port); "%s:%d Port: %d. Rx Overrun!\n",
__FILE__, __LINE__, port);
} }
if (linestatus & UART_LSR_THRE) { if (linestatus & UART_LSR_THRE) {
@ -1128,11 +1135,11 @@ static irqreturn_t neo_intr(int irq, void *voidbrd)
*/ */
uart_poll = readl(brd->re_map_membase + UART_17158_POLL_ADDR_OFFSET); uart_poll = readl(brd->re_map_membase + UART_17158_POLL_ADDR_OFFSET);
jsm_printk(INTR, INFO, &brd->pci_dev, jsm_dbg(INTR, &brd->pci_dev, "%s:%d uart_poll: %x\n",
"%s:%d uart_poll: %x\n", __FILE__, __LINE__, uart_poll); __FILE__, __LINE__, uart_poll);
if (!uart_poll) { if (!uart_poll) {
jsm_printk(INTR, INFO, &brd->pci_dev, jsm_dbg(INTR, &brd->pci_dev,
"Kernel interrupted to me, but no pending interrupts...\n"); "Kernel interrupted to me, but no pending interrupts...\n");
spin_unlock_irqrestore(&brd->bd_intr_lock, lock_flags); spin_unlock_irqrestore(&brd->bd_intr_lock, lock_flags);
return IRQ_NONE; return IRQ_NONE;
@ -1158,15 +1165,15 @@ static irqreturn_t neo_intr(int irq, void *voidbrd)
continue; continue;
} }
jsm_printk(INTR, INFO, &brd->pci_dev, jsm_dbg(INTR, &brd->pci_dev, "%s:%d port: %x type: %x\n",
"%s:%d port: %x type: %x\n", __FILE__, __LINE__, port, type); __FILE__, __LINE__, port, type);
/* Remove this port + type from uart_poll */ /* Remove this port + type from uart_poll */
uart_poll &= ~(jsm_offset_table[port]); uart_poll &= ~(jsm_offset_table[port]);
if (!type) { if (!type) {
/* If no type, just ignore it, and move onto next port */ /* If no type, just ignore it, and move onto next port */
jsm_printk(INTR, ERR, &brd->pci_dev, jsm_dbg(INTR, &brd->pci_dev,
"Interrupt with no type! port: %d\n", port); "Interrupt with no type! port: %d\n", port);
continue; continue;
} }
@ -1231,15 +1238,16 @@ static irqreturn_t neo_intr(int irq, void *voidbrd)
* these once and awhile. * these once and awhile.
* Its harmless, just ignore it and move on. * Its harmless, just ignore it and move on.
*/ */
jsm_printk(INTR, ERR, &brd->pci_dev, jsm_dbg(INTR, &brd->pci_dev,
"%s:%d Unknown Interrupt type: %x\n", __FILE__, __LINE__, type); "%s:%d Unknown Interrupt type: %x\n",
__FILE__, __LINE__, type);
continue; continue;
} }
} }
spin_unlock_irqrestore(&brd->bd_intr_lock, lock_flags); spin_unlock_irqrestore(&brd->bd_intr_lock, lock_flags);
jsm_printk(INTR, INFO, &brd->pci_dev, "finish.\n"); jsm_dbg(INTR, &brd->pci_dev, "finish\n");
return IRQ_HANDLED; return IRQ_HANDLED;
} }

102
drivers/tty/serial/jsm/jsm_tty.c
View file

@ -43,7 +43,7 @@ static inline int jsm_get_mstat(struct jsm_channel *ch)
unsigned char mstat; unsigned char mstat;
unsigned result; 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); 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) if (mstat & UART_MSR_DCD)
result |= TIOCM_CD; 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; return result;
} }
@ -79,14 +79,14 @@ static unsigned int jsm_tty_get_mctrl(struct uart_port *port)
int result; int result;
struct jsm_channel *channel = (struct jsm_channel *)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");
result = jsm_get_mstat(channel); result = jsm_get_mstat(channel);
if (result < 0) if (result < 0)
return -ENXIO; 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; 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; 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) if (mctrl & TIOCM_RTS)
channel->ch_mostat |= UART_MCR_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); 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); udelay(10);
} }
@ -135,23 +135,23 @@ static void jsm_tty_start_tx(struct uart_port *port)
{ {
struct jsm_channel *channel = (struct jsm_channel *)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); channel->ch_flags &= ~(CH_STOP);
jsm_tty_write(port); 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) static void jsm_tty_stop_tx(struct uart_port *port)
{ {
struct jsm_channel *channel = (struct jsm_channel *)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); 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) 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) { if (!channel->ch_rqueue) {
channel->ch_rqueue = kzalloc(RQUEUESIZE, GFP_KERNEL); channel->ch_rqueue = kzalloc(RQUEUESIZE, GFP_KERNEL);
if (!channel->ch_rqueue) { if (!channel->ch_rqueue) {
jsm_printk(INIT, ERR, &channel->ch_bd->pci_dev, jsm_dbg(INIT, &channel->ch_bd->pci_dev,
"unable to allocate read queue buf"); "unable to allocate read queue buf\n");
return -ENOMEM; return -ENOMEM;
} }
} }
if (!channel->ch_equeue) { if (!channel->ch_equeue) {
channel->ch_equeue = kzalloc(EQUEUESIZE, GFP_KERNEL); channel->ch_equeue = kzalloc(EQUEUESIZE, GFP_KERNEL);
if (!channel->ch_equeue) { if (!channel->ch_equeue) {
jsm_printk(INIT, ERR, &channel->ch_bd->pci_dev, jsm_dbg(INIT, &channel->ch_bd->pci_dev,
"unable to allocate error queue buf"); "unable to allocate error queue buf\n");
return -ENOMEM; return -ENOMEM;
} }
} }
@ -234,7 +234,7 @@ static int jsm_tty_open(struct uart_port *port)
/* /*
* Initialize if neither terminal is open. * 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"); "jsm_open: initializing channel in open...\n");
/* /*
@ -270,7 +270,7 @@ static int jsm_tty_open(struct uart_port *port)
channel->ch_open_count++; 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; return 0;
} }
@ -280,7 +280,7 @@ static void jsm_tty_close(struct uart_port *port)
struct ktermios *ts; struct ktermios *ts;
struct jsm_channel *channel = (struct jsm_channel *)port; 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; bd = channel->ch_bd;
ts = &port->state->port.tty->termios; 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 we have HUPCL set, lower DTR and RTS
*/ */
if (channel->ch_c_cflag & HUPCL) { 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"); "Close. HUPCL set, dropping DTR/RTS\n");
/* Drop RTS/DTR */ /* Drop RTS/DTR */
@ -304,7 +304,7 @@ static void jsm_tty_close(struct uart_port *port)
/* Turn off UART interrupts for this port */ /* Turn off UART interrupts for this port */
channel->ch_bd->bd_ops->uart_off(channel); 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, 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) if (!brd)
return -ENXIO; return -ENXIO;
jsm_printk(INIT, INFO, &brd->pci_dev, "start\n"); jsm_dbg(INIT, &brd->pci_dev, "start\n");
/* /*
* Initialize board structure elements. * 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); brd->channels[i] = kzalloc(sizeof(struct jsm_channel), GFP_KERNEL);
if (!brd->channels[i]) { 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", "%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); 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; return 0;
} }
@ -444,7 +444,7 @@ int jsm_uart_port_init(struct jsm_board *brd)
if (!brd) if (!brd)
return -ENXIO; return -ENXIO;
jsm_printk(INIT, INFO, &brd->pci_dev, "start\n"); jsm_dbg(INIT, &brd->pci_dev, "start\n");
/* /*
* Initialize board structure elements. * 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); 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; return 0;
} }
@ -493,7 +493,7 @@ int jsm_remove_uart_port(struct jsm_board *brd)
if (!brd) if (!brd)
return -ENXIO; return -ENXIO;
jsm_printk(INIT, INFO, &brd->pci_dev, "start\n"); jsm_dbg(INIT, &brd->pci_dev, "start\n");
/* /*
* Initialize board structure elements. * 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); 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; return 0;
} }
@ -531,7 +531,7 @@ void jsm_input(struct jsm_channel *ch)
int s = 0; int s = 0;
int i = 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) if (!ch)
return; return;
@ -560,7 +560,7 @@ void jsm_input(struct jsm_channel *ch)
return; 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 *If the device is not open, or CREAD is off, flush
@ -569,8 +569,9 @@ void jsm_input(struct jsm_channel *ch)
if (!tp || if (!tp ||
!(tp->termios.c_cflag & CREAD) ) { !(tp->termios.c_cflag & CREAD) ) {
jsm_printk(READ, INFO, &ch->ch_bd->pci_dev, jsm_dbg(READ, &ch->ch_bd->pci_dev,
"input. dropping %d bytes on port %d...\n", data_len, ch->ch_portnum); "input. dropping %d bytes on port %d...\n",
data_len, ch->ch_portnum);
ch->ch_r_head = tail; ch->ch_r_head = tail;
/* Force queue flow control to be released, if needed */ /* 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) { if (ch->ch_flags & CH_STOPI) {
spin_unlock_irqrestore(&ch->ch_lock, lock_flags); 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", "Port %d throttled, not reading any data. head: %x tail: %x\n",
ch->ch_portnum, head, tail); ch->ch_portnum, head, tail);
return; 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) { if (data_len <= 0) {
spin_unlock_irqrestore(&ch->ch_lock, lock_flags); 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; return;
} }
@ -653,7 +654,7 @@ void jsm_input(struct jsm_channel *ch)
/* Tell the tty layer its okay to "eat" the data now */ /* Tell the tty layer its okay to "eat" the data now */
tty_flip_buffer_push(tp); 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) 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 virt_carrier = 0;
int phys_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) if (!ch)
return; return;
@ -673,16 +674,16 @@ static void jsm_carrier(struct jsm_channel *ch)
return; return;
if (ch->ch_mistat & UART_MSR_DCD) { if (ch->ch_mistat & UART_MSR_DCD) {
jsm_printk(CARR, INFO, &ch->ch_bd->pci_dev, jsm_dbg(CARR, &ch->ch_bd->pci_dev, "mistat: %x D_CD: %x\n",
"mistat: %x D_CD: %x\n", ch->ch_mistat, ch->ch_mistat & UART_MSR_DCD); ch->ch_mistat, ch->ch_mistat & UART_MSR_DCD);
phys_carrier = 1; phys_carrier = 1;
} }
if (ch->ch_c_cflag & CLOCAL) if (ch->ch_c_cflag & CLOCAL)
virt_carrier = 1; virt_carrier = 1;
jsm_printk(CARR, INFO, &ch->ch_bd->pci_dev, jsm_dbg(CARR, &ch->ch_bd->pci_dev, "DCD: physical: %d virt: %d\n",
"DCD: physical: %d virt: %d\n", phys_carrier, virt_carrier); phys_carrier, virt_carrier);
/* /*
* Test for a VIRTUAL carrier transition to HIGH. * 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. * for carrier in the open routine.
*/ */
jsm_printk(CARR, INFO, &ch->ch_bd->pci_dev, jsm_dbg(CARR, &ch->ch_bd->pci_dev, "carrier: virt DCD rose\n");
"carrier: virt DCD rose\n");
if (waitqueue_active(&(ch->ch_flags_wait))) if (waitqueue_active(&(ch->ch_flags_wait)))
wake_up_interruptible(&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. * 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"); "carrier: physical DCD rose\n");
if (waitqueue_active(&(ch->ch_flags_wait))) 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)) { if(!(ch->ch_flags & CH_RECEIVER_OFF)) {
bd_ops->disable_receiver(ch); bd_ops->disable_receiver(ch);
ch->ch_flags |= (CH_RECEIVER_OFF); ch->ch_flags |= (CH_RECEIVER_OFF);
jsm_printk(READ, INFO, &ch->ch_bd->pci_dev, jsm_dbg(READ, &ch->ch_bd->pci_dev,
"Internal queue hit hilevel mark (%d)! Turning off interrupts.\n", "Internal queue hit hilevel mark (%d)! Turning off interrupts\n",
qleft); qleft);
} }
} }
@ -800,8 +800,9 @@ void jsm_check_queue_flow_control(struct jsm_channel *ch)
if (ch->ch_stops_sent <= MAX_STOPS_SENT) { if (ch->ch_stops_sent <= MAX_STOPS_SENT) {
bd_ops->send_stop_character(ch); bd_ops->send_stop_character(ch);
ch->ch_stops_sent++; ch->ch_stops_sent++;
jsm_printk(READ, INFO, &ch->ch_bd->pci_dev, jsm_dbg(READ, &ch->ch_bd->pci_dev,
"Sending stop char! Times sent: %x\n", ch->ch_stops_sent); "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) { if (ch->ch_flags & CH_RECEIVER_OFF) {
bd_ops->enable_receiver(ch); bd_ops->enable_receiver(ch);
ch->ch_flags &= ~(CH_RECEIVER_OFF); ch->ch_flags &= ~(CH_RECEIVER_OFF);
jsm_printk(READ, INFO, &ch->ch_bd->pci_dev, jsm_dbg(READ, &ch->ch_bd->pci_dev,
"Internal queue hit lowlevel mark (%d)! Turning on interrupts.\n", "Internal queue hit lowlevel mark (%d)! Turning on interrupts\n",
qleft); 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) { else if (ch->ch_c_iflag & IXOFF && ch->ch_stops_sent) {
ch->ch_stops_sent = 0; ch->ch_stops_sent = 0;
bd_ops->send_start_character(ch); 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");
} }
} }
} }