aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/serial/serial_core.c17
1 files changed, 5 insertions, 12 deletions
diff --git a/drivers/serial/serial_core.c b/drivers/serial/serial_core.c
index f409be37b62f..326020f86f75 100644
--- a/drivers/serial/serial_core.c
+++ b/drivers/serial/serial_core.c
@@ -37,13 +37,6 @@
37#include <asm/irq.h> 37#include <asm/irq.h>
38#include <asm/uaccess.h> 38#include <asm/uaccess.h>
39 39
40#undef DEBUG
41#ifdef DEBUG
42#define DPRINTK(x...) printk(x)
43#else
44#define DPRINTK(x...) do { } while (0)
45#endif
46
47/* 40/*
48 * This is used to lock changes in serial line configuration. 41 * This is used to lock changes in serial line configuration.
49 */ 42 */
@@ -552,7 +545,7 @@ static void uart_flush_buffer(struct tty_struct *tty)
552 return; 545 return;
553 } 546 }
554 547
555 DPRINTK("uart_flush_buffer(%d) called\n", tty->index); 548 pr_debug("uart_flush_buffer(%d) called\n", tty->index);
556 549
557 spin_lock_irqsave(&port->lock, flags); 550 spin_lock_irqsave(&port->lock, flags);
558 uart_circ_clear(&state->info->xmit); 551 uart_circ_clear(&state->info->xmit);
@@ -1224,7 +1217,7 @@ static void uart_close(struct tty_struct *tty, struct file *filp)
1224 1217
1225 port = state->port; 1218 port = state->port;
1226 1219
1227 DPRINTK("uart_close(%d) called\n", port->line); 1220 pr_debug("uart_close(%d) called\n", port->line);
1228 1221
1229 mutex_lock(&state->mutex); 1222 mutex_lock(&state->mutex);
1230 1223
@@ -1343,7 +1336,7 @@ static void uart_wait_until_sent(struct tty_struct *tty, int timeout)
1343 1336
1344 expire = jiffies + timeout; 1337 expire = jiffies + timeout;
1345 1338
1346 DPRINTK("uart_wait_until_sent(%d), jiffies=%lu, expire=%lu...\n", 1339 pr_debug("uart_wait_until_sent(%d), jiffies=%lu, expire=%lu...\n",
1347 port->line, jiffies, expire); 1340 port->line, jiffies, expire);
1348 1341
1349 /* 1342 /*
@@ -1372,7 +1365,7 @@ static void uart_hangup(struct tty_struct *tty)
1372 struct uart_state *state = tty->driver_data; 1365 struct uart_state *state = tty->driver_data;
1373 1366
1374 BUG_ON(!kernel_locked()); 1367 BUG_ON(!kernel_locked());
1375 DPRINTK("uart_hangup(%d)\n", state->port->line); 1368 pr_debug("uart_hangup(%d)\n", state->port->line);
1376 1369
1377 mutex_lock(&state->mutex); 1370 mutex_lock(&state->mutex);
1378 if (state->info && state->info->flags & UIF_NORMAL_ACTIVE) { 1371 if (state->info && state->info->flags & UIF_NORMAL_ACTIVE) {
@@ -1570,7 +1563,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
1570 int retval, line = tty->index; 1563 int retval, line = tty->index;
1571 1564
1572 BUG_ON(!kernel_locked()); 1565 BUG_ON(!kernel_locked());
1573 DPRINTK("uart_open(%d) called\n", line); 1566 pr_debug("uart_open(%d) called\n", line);
1574 1567
1575 /* 1568 /*
1576 * tty->driver->num won't change, so we won't fail here with 1569 * tty->driver->num won't change, so we won't fail here with