Skip to contentSkip to conversation

isapnp: remove debug leftovers

PATCH In review Andy Shevchenko 2 participants 3 messages Apr 23, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/2 isapnp: remove debug leftovers

There are couple of #if 0's to avoid debug printing. Let's remove them as Rafael suggested.

---
 drivers/pnp/isapnp/core.c | 11 -----------
 1 file changed, 11 deletions(-)
drivers/pnp/isapnp/core.c +0 -11
index 918d5f0..cf88f9b6 100644
@@ -379,10 +379,6 @@ static int __init isapnp_read_tag(unsigned char *type, unsigned short *size)
 		*type = (tag >> 3) & 0x0f;
 		*size = tag & 0x07;
 	}
-#if 0
-	printk(KERN_DEBUG "tag = 0x%x, type = 0x%x, size = %i\n", tag, *type,
-	       *size);
-#endif
 	if (*type == 0xff && *size == 0xffff)	/* probably invalid data */
 		return -1;
 	return 0;
@@ -813,13 +809,6 @@ static int __init isapnp_build_device_list(void)
 		if (!card)
 			continue;
 
-#if 0
-		dev_info(&card->dev,
-		       "vendor: %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x\n",
-		       header[0], header[1], header[2], header[3], header[4],
-		       header[5], header[6], header[7], header[8]);
-		dev_info(&card->dev, "checksum = %#x\n", checksum);
-#endif
 		INIT_LIST_HEAD(&card->devices);
 		card->serial =
 		    (header[7] << 24) | (header[6] << 16) | (header[5] << 8) |
Signature · 1 line
1.8.2.rc0.22.gb3600c3
#1 lore raw

PATCH v2 2/2 pnp: use %*phC to dump small buffers

Instead of pronting buffer byte-by-byte let's use native specificator to do the job.

---
 drivers/pnp/pnpbios/proc.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/pnp/pnpbios/proc.c +2 -3
index 8dafd65..c212db0 100644
@@ -185,10 +185,9 @@ static int pnp_devices_proc_show(struct seq_file *m, void *v)
 
 		if (pnp_bios_get_dev_node(&nodenum, PNPMODE_DYNAMIC, node))
 			break;
-		seq_printf(m, "%02x\t%08x\t%02x:%02x:%02x\t%04x\n",
+		seq_printf(m, "%02x\t%08x\t%3phC\t%04x\n",
 			     node->handle, node->eisa_id,
-			     node->type_code[0], node->type_code[1],
-			     node->type_code[2], node->flags);
+			     node->type_code, node->flags);
 		if (nodenum <= thisnodenum) {
 			printk(KERN_ERR
 			       "%s Node number 0x%x is out of sequence following node 0x%x. Aborting.\n",
Signature · 1 line
1.8.2.rc0.22.gb3600c3
#2 lore raw
In reply to Andy Shevchenko
Quoted 4 lines · Andy Shevchenko

There are couple of #if 0's to avoid debug printing. Let's remove them as Rafael suggested.

Both patches applied.

Thanks,
Rafael

Quoted 34 lines
---
 drivers/pnp/isapnp/core.c | 11 -----------
 1 file changed, 11 deletions(-)
drivers/pnp/isapnp/core.c +0 -11
index 918d5f0..cf88f9b6 100644
@@ -379,10 +379,6 @@ static int __init isapnp_read_tag(unsigned char *type, unsigned short *size)
 		*type = (tag >> 3) & 0x0f;
 		*size = tag & 0x07;
 	}
-#if 0
-	printk(KERN_DEBUG "tag = 0x%x, type = 0x%x, size = %i\n", tag, *type,
-	       *size);
-#endif
 	if (*type == 0xff && *size == 0xffff)	/* probably invalid data */
 		return -1;
 	return 0;
@@ -813,13 +809,6 @@ static int __init isapnp_build_device_list(void)
 		if (!card)
 			continue;
 
-#if 0
-		dev_info(&card->dev,
-		       "vendor: %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x\n",
-		       header[0], header[1], header[2], header[3], header[4],
-		       header[5], header[6], header[7], header[8]);
-		dev_info(&card->dev, "checksum = %#x\n", checksum);
-#endif
 		INIT_LIST_HEAD(&card->devices);
 		card->serial =
 		    (header[7] << 24) | (header[6] << 16) | (header[5] << 8) |
Signature · 2 lines
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.