* [PATCH 2/3] Char: isicom, use pr_debug
2007-05-01 18:12 [PATCH 1/3] Char: mxser, schedule for removal Jiri Slaby
@ 2007-05-01 18:12 ` Jiri Slaby
2007-05-01 18:13 ` [PATCH 3/3] Serial: serial_core, " Jiri Slaby
1 sibling, 0 replies; 3+ messages in thread
From: Jiri Slaby @ 2007-05-01 18:12 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-kernel
isicom, use pr_debug
Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
---
commit f4fba1005f8f25f5dc369f6e6e04643f4b6a6822
tree 82ba620999de3010b7aebf2a31998e7625e878aa
parent 429ee8495d50042ae8894b8302887b191f56fe5f
author Jiri Slaby <jirislaby@gmail.com> Tue, 01 May 2007 20:09:53 +0200
committer Jiri Slaby <jirislaby@gmail.com> Tue, 01 May 2007 20:09:53 +0200
drivers/char/isicom.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/drivers/char/isicom.c b/drivers/char/isicom.c
index 43ab9ed..761f777 100644
--- a/drivers/char/isicom.c
+++ b/drivers/char/isicom.c
@@ -137,11 +137,10 @@
#define InterruptTheCard(base) outw(0, (base) + 0xc)
#define ClearInterrupt(base) inw((base) + 0x0a)
+#define pr_dbg(str...) pr_debug("ISICOM: " str)
#ifdef DEBUG
-#define pr_dbg(str...) printk(KERN_DEBUG "ISICOM: " str)
#define isicom_paranoia_check(a, b, c) __isicom_paranoia_check((a), (b), (c))
#else
-#define pr_dbg(str...) do { } while (0)
#define isicom_paranoia_check(a, b, c) 0
#endif
^ permalink raw reply related [flat|nested] 3+ messages in thread* [PATCH 3/3] Serial: serial_core, use pr_debug
2007-05-01 18:12 [PATCH 1/3] Char: mxser, schedule for removal Jiri Slaby
2007-05-01 18:12 ` [PATCH 2/3] Char: isicom, use pr_debug Jiri Slaby
@ 2007-05-01 18:13 ` Jiri Slaby
1 sibling, 0 replies; 3+ messages in thread
From: Jiri Slaby @ 2007-05-01 18:13 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-kernel
serial_core, use pr_debug
Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
---
commit 2261bd870cd3c289ec74db4b2cfddb5c9ed59e95
tree 05f23ba7ce1add483b1e72c5a02bc0309536b7ea
parent f4fba1005f8f25f5dc369f6e6e04643f4b6a6822
author Jiri Slaby <jirislaby@gmail.com> Tue, 01 May 2007 20:10:04 +0200
committer Jiri Slaby <jirislaby@gmail.com> Tue, 01 May 2007 20:10:04 +0200
drivers/serial/serial_core.c | 17 +++++------------
1 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/drivers/serial/serial_core.c b/drivers/serial/serial_core.c
index 74e34ba..6dbcd7e 100644
--- a/drivers/serial/serial_core.c
+++ b/drivers/serial/serial_core.c
@@ -37,13 +37,6 @@
#include <asm/irq.h>
#include <asm/uaccess.h>
-#undef DEBUG
-#ifdef DEBUG
-#define DPRINTK(x...) printk(x)
-#else
-#define DPRINTK(x...) do { } while (0)
-#endif
-
/*
* This is used to lock changes in serial line configuration.
*/
@@ -560,7 +553,7 @@ static void uart_flush_buffer(struct tty_struct *tty)
return;
}
- DPRINTK("uart_flush_buffer(%d) called\n", tty->index);
+ pr_debug("uart_flush_buffer(%d) called\n", tty->index);
spin_lock_irqsave(&port->lock, flags);
uart_circ_clear(&state->info->xmit);
@@ -1234,7 +1227,7 @@ static void uart_close(struct tty_struct *tty, struct file *filp)
port = state->port;
- DPRINTK("uart_close(%d) called\n", port->line);
+ pr_debug("uart_close(%d) called\n", port->line);
mutex_lock(&state->mutex);
@@ -1353,7 +1346,7 @@ static void uart_wait_until_sent(struct tty_struct *tty, int timeout)
expire = jiffies + timeout;
- DPRINTK("uart_wait_until_sent(%d), jiffies=%lu, expire=%lu...\n",
+ pr_debug("uart_wait_until_sent(%d), jiffies=%lu, expire=%lu...\n",
port->line, jiffies, expire);
/*
@@ -1382,7 +1375,7 @@ static void uart_hangup(struct tty_struct *tty)
struct uart_state *state = tty->driver_data;
BUG_ON(!kernel_locked());
- DPRINTK("uart_hangup(%d)\n", state->port->line);
+ pr_debug("uart_hangup(%d)\n", state->port->line);
mutex_lock(&state->mutex);
if (state->info && state->info->flags & UIF_NORMAL_ACTIVE) {
@@ -1584,7 +1577,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
int retval, line = tty->index;
BUG_ON(!kernel_locked());
- DPRINTK("uart_open(%d) called\n", line);
+ pr_debug("uart_open(%d) called\n", line);
/*
* tty->driver->num won't change, so we won't fail here with
^ permalink raw reply related [flat|nested] 3+ messages in thread