diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-04-28 01:54:41 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-04-28 01:54:41 +0200 |
| commit | ae6208301e1e37a203fab817b59279a0f5d774c6 (patch) | |
| tree | 4d00fbf654cb77d37212185f58101b5b6007e73d /drivers/pnp | |
| parent | 355c63e5ac963af0ac95e72b74693cfe2527a76b (diff) | |
| parent | ac2a509e428462a2ef69f52d26843df0f74568e6 (diff) | |
| download | linux-ae6208301e1e37a203fab817b59279a0f5d774c6.tar.gz linux-ae6208301e1e37a203fab817b59279a0f5d774c6.tar.bz2 linux-ae6208301e1e37a203fab817b59279a0f5d774c6.zip | |
Merge branch 'pnp'
* pnp:
pnp: use %*phC to dump small buffers
isapnp: remove debug leftovers
Diffstat (limited to 'drivers/pnp')
| -rw-r--r-- | drivers/pnp/isapnp/core.c | 11 | ||||
| -rw-r--r-- | drivers/pnp/pnpbios/proc.c | 5 |
2 files changed, 2 insertions, 14 deletions
diff --git a/drivers/pnp/isapnp/core.c b/drivers/pnp/isapnp/core.c index 918d5f044865..cf88f9b62445 100644 --- a/drivers/pnp/isapnp/core.c +++ b/drivers/pnp/isapnp/core.c @@ -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) | diff --git a/drivers/pnp/pnpbios/proc.c b/drivers/pnp/pnpbios/proc.c index 63ddb0173456..1c03ee822e50 100644 --- a/drivers/pnp/pnpbios/proc.c +++ b/drivers/pnp/pnpbios/proc.c @@ -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", |