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/pnpbios | |
parent | 355c63e5ac963af0ac95e72b74693cfe2527a76b (diff) | |
parent | ac2a509e428462a2ef69f52d26843df0f74568e6 (diff) | |
download | linux-ae6208301e1e37a203fab817b59279a0f5d774c6.tar.bz2 |
Merge branch 'pnp'
* pnp:
pnp: use %*phC to dump small buffers
isapnp: remove debug leftovers
Diffstat (limited to 'drivers/pnp/pnpbios')
-rw-r--r-- | drivers/pnp/pnpbios/proc.c | 5 |
1 files changed, 2 insertions, 3 deletions
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", |