From: Matthew Martin <lihnucks@gmail.com>
To: kernel-janitors@vger.kernel.org
Subject: [KJ] [PATCH] Convert DPRINTK to pr_debug in drivers/parport/daisy.c
Date: Mon, 14 Aug 2006 23:16:08 +0000 [thread overview]
Message-ID: <44E10438.7060900@gmail.com> (raw)
In-Reply-To: <44B44D3A.8010101@gmail.com>
Hello,
This converts a DPRINTK macro in drivers/parport/daisy.c to pr_debug.
Signed-Off-By: Matthew Martin <lihnucks@gmail.com>
---
--- vanilla-linux-2.6.18-rc4/drivers/parport/daisy.c 2006-08-09 19:55:17.000000000 -0500
+++ linux-2.6.18-rc4/drivers/parport/daisy.c 2006-08-14 17:22:38.000000000 -0500
@@ -23,17 +23,12 @@
#include <linux/parport.h>
#include <linux/delay.h>
#include <linux/sched.h>
+#include <linux/kernel.h>
#include <asm/current.h>
#include <asm/uaccess.h>
-#undef DEBUG
-#ifdef DEBUG
-#define DPRINTK(stuff...) printk (stuff)
-#else
-#define DPRINTK(stuff...)
-#endif
static struct daisydev {
struct daisydev *next;
@@ -322,8 +317,7 @@ static int cpp_daisy (struct parport *po
| PARPORT_STATUS_PAPEROUT
| PARPORT_STATUS_SELECT
| PARPORT_STATUS_ERROR)) {
- DPRINTK (KERN_DEBUG "%s: cpp_daisy: aa5500ff(%02x)\n",
- port->name, s);
+ pr_debug ("%s: cpp_daisy: aa5500ff(%02x)\n", port->name, s);
return -ENXIO;
}
@@ -333,8 +327,7 @@ static int cpp_daisy (struct parport *po
| PARPORT_STATUS_SELECT
| PARPORT_STATUS_ERROR);
if (s != (PARPORT_STATUS_SELECT | PARPORT_STATUS_ERROR)) {
- DPRINTK (KERN_DEBUG "%s: cpp_daisy: aa5500ff87(%02x)\n",
- port->name, s);
+ pr_debug ("%s: cpp_daisy: aa5500ff87(%02x)\n", port->name, s);
return -ENXIO;
}
@@ -369,7 +362,7 @@ static int cpp_mux (struct parport *port
s = parport_read_status (port);
if (!(s & PARPORT_STATUS_ACK)) {
- DPRINTK (KERN_DEBUG "%s: cpp_mux: aa55f00f52ad%02x(%02x)\n",
+ pr_debug ("%s: cpp_mux: aa55f00f52ad%02x(%02x)\n",
port->name, cmd, s);
return -EIO;
}
@@ -455,8 +448,7 @@ static int assign_addrs (struct parport
| PARPORT_STATUS_PAPEROUT
| PARPORT_STATUS_SELECT
| PARPORT_STATUS_ERROR)) {
- DPRINTK (KERN_DEBUG "%s: assign_addrs: aa5500ff(%02x)\n",
- port->name, s);
+ pr_debug ("%s: assign_addrs: aa5500ff(%02x)\n", port->name, s);
return 0;
}
@@ -466,7 +458,7 @@ static int assign_addrs (struct parport
| PARPORT_STATUS_SELECT
| PARPORT_STATUS_ERROR);
if (s != (PARPORT_STATUS_SELECT | PARPORT_STATUS_ERROR)) {
- DPRINTK (KERN_DEBUG "%s: assign_addrs: aa5500ff87(%02x)\n",
+ pr_debug ("%s: assign_addrs: aa5500ff87(%02x)\n",
port->name, s);
return 0;
}
@@ -504,7 +496,7 @@ static int assign_addrs (struct parport
parport_write_data (port, 0xff); udelay (2);
detected = numdevs - thisdev;
- DPRINTK (KERN_DEBUG "%s: Found %d daisy-chained devices\n", port->name,
+ pr_debug ("%s: Found %d daisy-chained devices\n", port->name,
detected);
/* Ask the new devices to introduce themselves. */
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
https://lists.osdl.org/mailman/listinfo/kernel-janitors
next prev parent reply other threads:[~2006-08-14 23:16 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-07-12 1:15 [KJ] [PATCH] Convert DPRINTK to pr_debug in drivers/scsi/ahci.c Matthew Martin
2006-07-12 12:05 ` Matthew Martin
2006-07-12 13:00 ` Domen Puncer
2006-07-12 14:20 ` [KJ] [PATCH] Convert DPRINTK to pr_debug in Matthew Martin
2006-07-12 14:58 ` [KJ] [PATCH] Convert DPRINTK to pr_debug in drivers/scsi/ahci.c Randy.Dunlap
2006-08-14 23:16 ` Matthew Martin [this message]
2006-08-14 23:59 ` [KJ] [PATCH] Convert DPRINTK to pr_debug in Nishanth Aravamudan
2006-08-15 3:15 ` Matthew Martin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=44E10438.7060900@gmail.com \
--to=lihnucks@gmail.com \
--cc=kernel-janitors@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.