Skip to contentSkip to conversation

Convert DPRINTK to pr_debug in drivers/scsi/ahci.c

PATCH In review Matthew Martin 4 participants 8 messages Jul 12, 2006 – Aug 15, 2006

Subsystems (4)
SCSI Kernel janitors Framebuffer layer Parallel port
lore
Share & tools
lore

Matthew Martin

author
#0 lore raw

PATCH 1/1 Convert DPRINTK to pr_debug in drivers/scsi/ahci.c

Hello,
This converts DPRINTK to pr_debug in drivers/scsi/ahci.c

Signed-off-by Matthew Martin <[email protected]>

---

drivers/scsi/ahci.c +5 -5
@@ -617,10 +617,10 @@ static int ahci_softreset(struct ata_por
 	u8 *fis;
 	int rc;
 
-	DPRINTK("ENTER\n");
+	pr_debug("ENTER\n");
 
 	if (ata_port_offline(ap)) {
-		DPRINTK("PHY reports no device\n");
+		pr_debug("PHY reports no device\n");
 		*class = ATA_DEV_NONE;
 		return 0;
 	}

@@ -702,7 +702,7 @@ static int ahci_softreset(struct ata_por
 		*class = ahci_dev_classify(ap);
 	}
 
-	DPRINTK("EXIT, class=%u\n", *class);
+	pr_debug("EXIT, class=%u\n", *class);
 	return 0;
 
  fail_restart:

@@ -719,7 +719,7 @@ static int ahci_hardreset(struct ata_por
 	struct ata_taskfile tf;
 	int rc;
 
-	DPRINTK("ENTER\n");
+	pr_debug("ENTER\n");
 
 	ahci_stop_engine(ap);
 

@@ -737,7 +737,7 @@ static int ahci_hardreset(struct ata_por
 	if (*class = ATA_DEV_UNKNOWN)
 		*class = ATA_DEV_NONE;
 
-	DPRINTK("EXIT, rc=%d, class=%u\n", rc, *class);
+	pr_debug("EXIT, rc=%d, class=%u\n", rc, *class);
 	return rc;
 }

_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors

author
#1 lore raw
Quoted 6 lines · Domen Puncer
Quoted 3 lines · Matthew Martin

Hello,
This converts DPRINTK to pr_debug in drivers/scsi/ahci.c

Quoted 10 lines

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 [email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors

author
#3 lore raw

PATCH 1/1 Convert DPRINTK to pr_debug in

In reply to Matthew Martin

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 <[email protected]>

---

drivers/video/i810/i810-i2c.c +5 -12
@@ -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
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors

#4 lore raw
In reply to Matthew Martin
Quoted 10 lines · On Wed, 12 Jul 2006 07:05:03 -0500 Matthew Martin wrote:
Quoted 9 lines · Domen Puncer
Quoted 3 lines · Matthew Martin

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.

Quoted 8 lines
Quoted 7 lines

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
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors

author
#5 lore raw

PATCH 1/1 Convert DPRINTK to pr_debug in drivers/parport/daisy.c

In reply to Matthew Martin

Hello,
This converts a DPRINTK macro in drivers/parport/daisy.c to pr_debug.

Signed-off-by Matthew Martin <[email protected]>

---

drivers/parport/daisy.c +7 -15
@@ -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
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors

#6 lore raw

Re: [KJ] [PATCH] Convert DPRINTK to pr_debug in

In reply to Matthew Martin
Quoted 29 lines · Matthew Martin

Hello,
This converts a DPRINTK macro in drivers/parport/daisy.c to pr_debug.

Signed-off-by Matthew Martin <[email protected]>

---

drivers/parport/daisy.c +1 -6
@@ -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;

drivers/parport/daisy.c static int cpp_daisy (struct parport *po · line 320

Quoted 6 lines
drivers/parport/daisy.c +1 -2
@@ -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

Signature · 6 lines
Nishanth Aravamudan <[email protected]>
IBM Linux Technology Center
_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors
author
#7 lore raw

Re: [KJ] [PATCH] Convert DPRINTK to pr_debug in

In reply to Matthew Martin
Quoted 40 lines · Nishanth Aravamudan
Quoted 29 lines · Matthew Martin

Hello,
This converts a DPRINTK macro in drivers/parport/daisy.c to pr_debug.

Signed-off-by Matthew Martin <[email protected]>

---

drivers/parport/daisy.c 2006-08-14 17:22:38.000000000 -0500 renamed from drivers/parport/daisy.c 2006-08-09 19:55:17.000000000 -0500 +1 -6
@@ -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;

drivers/parport/daisy.c 2006-08-14 17:22:38.000000000 -0500 static int cpp_daisy (struct parport *po · line 320

Quoted 6 lines
drivers/parport/daisy.c 2006-08-14 17:22:38.000000000 -0500 renamed from drivers/parport/daisy.c 2006-08-09 19:55:17.000000000 -0500 +1 -2
@@ -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?

Quoted 7 lines

Thanks,
Nish

--
Nishanth Aravamudan <[email protected]>
IBM Linux Technology Center

That will be the next thing I do.

Matthew
_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors