* Re: [KJ] [PATCH] Convert DPRINTK to pr_debug in drivers/scsi/ahci.c
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
` (5 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Matthew Martin @ 2006-07-12 12:05 UTC (permalink / raw)
To: kernel-janitors
Domen Puncer wrote:
> On 11/07/06 20:15 -0500, Matthew Martin wrote:
>
>> Hello,
>> This converts DPRINTK to pr_debug in drivers/scsi/ahci.c
>>
>
> If you look at libata.h, you see that DPRINTK also includes the
> function name.
>
> Maybe it's better left as it is (it looks like it's a part of
> libata api).
>
>
> Domen
>
>
Then someone should take it off the Kernel Janitor TODO list...
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
https://lists.osdl.org/mailman/listinfo/kernel-janitors
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [KJ] [PATCH] Convert DPRINTK to pr_debug in drivers/scsi/ahci.c
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
` (4 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Domen Puncer @ 2006-07-12 13:00 UTC (permalink / raw)
To: kernel-janitors
On 11/07/06 20:15 -0500, Matthew Martin wrote:
> Hello,
> This converts DPRINTK to pr_debug in drivers/scsi/ahci.c
If you look at libata.h, you see that DPRINTK also includes the
function name.
Maybe it's better left as it is (it looks like it's a part of
libata api).
Domen
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
https://lists.osdl.org/mailman/listinfo/kernel-janitors
^ permalink raw reply [flat|nested] 8+ messages in thread* [KJ] [PATCH] Convert DPRINTK to pr_debug in
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 ` Matthew Martin
2006-07-12 14:58 ` [KJ] [PATCH] Convert DPRINTK to pr_debug in drivers/scsi/ahci.c Randy.Dunlap
` (3 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Matthew Martin @ 2006-07-12 14:20 UTC (permalink / raw)
To: kernel-janitors
Hello,
This converts DPRINTK to pr_debug in drivers/video/i810/i810-i2c.c
I was wondering if I need to add a //#define DEBUG /* remove this for debugging info */ line.
I was searching lkml.org and I saw some of these kind of patches had a line like that.
Signed-off-by: Matthew Martin <lihnucks@gmail.com>
---
--- vanilla-linux-2.6.18-rc1/drivers/video/i810/i810-i2c.c 2006-07-11 15:56:03.000000000 -0500
+++ linux-2.6.18-rc1/drivers/video/i810/i810-i2c.c 2006-07-12 08:37:11.000000000 -0500
@@ -32,13 +32,6 @@
#define SDA_VAL_OUT 0x0800
#define SDA_VAL_IN 0x1000
-#define DEBUG /* define this for verbose EDID parsing output */
-
-#ifdef DEBUG
-#define DPRINTK(fmt, args...) printk(fmt,## args)
-#else
-#define DPRINTK(fmt, args...)
-#endif
static void i810i2c_setscl(void *data, int state)
{
@@ -169,17 +162,17 @@ static u8 *i810_do_probe_i2c_edid(struct
buf = kmalloc(EDID_LENGTH, GFP_KERNEL);
if (!buf) {
- DPRINTK("i810-i2c: Failed to allocate memory\n");
+ pr_debug("i810-i2c: Failed to allocate memory\n");
return NULL;
}
msgs[1].buf = buf;
if (i2c_transfer(&chan->adapter, msgs, 2) = 2) {
- DPRINTK("i810-i2c: I2C Transfer successful\n");
+ pr_debug("i810-i2c: I2C Transfer successful\n");
return buf;
}
- DPRINTK("i810-i2c: Unable to read EDID block.\n");
+ pr_debug("i810-i2c: Unable to read EDID block.\n");
kfree(buf);
return NULL;
}
@@ -190,7 +183,7 @@ int i810_probe_i2c_connector(struct fb_i
u8 *edid = NULL;
int i;
- DPRINTK("i810-i2c: Probe DDC%i Bus\n", conn+1);
+ pr_debug("i810-i2c: Probe DDC%i Bus\n", conn+1);
if (conn < par->ddc_num) {
for (i = 0; i < 3; i++) {
/* Do the real work */
@@ -202,7 +195,7 @@ int i810_probe_i2c_connector(struct fb_i
const u8 *e = fb_firmware_edid(info->device);
if (e != NULL) {
- DPRINTK("i810-i2c: Getting EDID from BIOS\n");
+ pr_debug("i810-i2c: Getting EDID from BIOS\n");
edid = kmalloc(EDID_LENGTH, GFP_KERNEL);
if (edid)
memcpy(edid, e, EDID_LENGTH);
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
https://lists.osdl.org/mailman/listinfo/kernel-janitors
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [KJ] [PATCH] Convert DPRINTK to pr_debug in drivers/scsi/ahci.c
2006-07-12 1:15 [KJ] [PATCH] Convert DPRINTK to pr_debug in drivers/scsi/ahci.c Matthew Martin
` (2 preceding siblings ...)
2006-07-12 14:20 ` [KJ] [PATCH] Convert DPRINTK to pr_debug in Matthew Martin
@ 2006-07-12 14:58 ` Randy.Dunlap
2006-08-14 23:16 ` [KJ] [PATCH] Convert DPRINTK to pr_debug in drivers/parport/daisy.c Matthew Martin
` (2 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Randy.Dunlap @ 2006-07-12 14:58 UTC (permalink / raw)
To: kernel-janitors
On Wed, 12 Jul 2006 07:05:03 -0500 Matthew Martin wrote:
> Domen Puncer wrote:
> > On 11/07/06 20:15 -0500, Matthew Martin wrote:
> >
> >> Hello,
> >> This converts DPRINTK to pr_debug in drivers/scsi/ahci.c
> >>
> >
> > If you look at libata.h, you see that DPRINTK also includes the
> > function name.
> >
> > Maybe it's better left as it is (it looks like it's a part of
> > libata api).
> >
> >
> > Domen
> >
> >
> Then someone should take it off the Kernel Janitor TODO list...
It's also a good idea to ask before spending much time on
something (although this one wasn't "much" time).
---
~Randy
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
https://lists.osdl.org/mailman/listinfo/kernel-janitors
^ permalink raw reply [flat|nested] 8+ messages in thread* [KJ] [PATCH] Convert DPRINTK to pr_debug in drivers/parport/daisy.c
2006-07-12 1:15 [KJ] [PATCH] Convert DPRINTK to pr_debug in drivers/scsi/ahci.c Matthew Martin
` (3 preceding siblings ...)
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
2006-08-14 23:59 ` [KJ] [PATCH] Convert DPRINTK to pr_debug in Nishanth Aravamudan
2006-08-15 3:15 ` Matthew Martin
6 siblings, 0 replies; 8+ messages in thread
From: Matthew Martin @ 2006-08-14 23:16 UTC (permalink / raw)
To: kernel-janitors
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
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [KJ] [PATCH] Convert DPRINTK to pr_debug in
2006-07-12 1:15 [KJ] [PATCH] Convert DPRINTK to pr_debug in drivers/scsi/ahci.c Matthew Martin
` (4 preceding siblings ...)
2006-08-14 23:16 ` [KJ] [PATCH] Convert DPRINTK to pr_debug in drivers/parport/daisy.c Matthew Martin
@ 2006-08-14 23:59 ` Nishanth Aravamudan
2006-08-15 3:15 ` Matthew Martin
6 siblings, 0 replies; 8+ messages in thread
From: Nishanth Aravamudan @ 2006-08-14 23:59 UTC (permalink / raw)
To: kernel-janitors
On 14.08.2006 [18:16:08 -0500], Matthew Martin wrote:
> 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);
Care to stack a patch on top or before this, to not put a space before
the ( in every function call?
Thanks,
Nish
--
Nishanth Aravamudan <nacc@us.ibm.com>
IBM Linux Technology Center
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
https://lists.osdl.org/mailman/listinfo/kernel-janitors
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [KJ] [PATCH] Convert DPRINTK to pr_debug in
2006-07-12 1:15 [KJ] [PATCH] Convert DPRINTK to pr_debug in drivers/scsi/ahci.c Matthew Martin
` (5 preceding siblings ...)
2006-08-14 23:59 ` [KJ] [PATCH] Convert DPRINTK to pr_debug in Nishanth Aravamudan
@ 2006-08-15 3:15 ` Matthew Martin
6 siblings, 0 replies; 8+ messages in thread
From: Matthew Martin @ 2006-08-15 3:15 UTC (permalink / raw)
To: kernel-janitors
On 8/14/06, Nishanth Aravamudan <nacc@us.ibm.com> wrote:
> On 14.08.2006 [18:16:08 -0500], Matthew Martin wrote:
> > 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);
>
> Care to stack a patch on top or before this, to not put a space before
> the ( in every function call?
>
> Thanks,
> Nish
>
> --
> Nishanth Aravamudan <nacc@us.ibm.com>
> IBM Linux Technology Center
>
That will be the next thing I do.
Matthew
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
https://lists.osdl.org/mailman/listinfo/kernel-janitors
^ permalink raw reply [flat|nested] 8+ messages in thread