Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ae620830 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'pnp' 

* pnp:
  pnp: use %*phC to dump small buffers
  isapnp: remove debug leftovers
parents 355c63e5 ac2a509e

drivers/pnp/isapnp/core.c

+0 −11
Original line number Diff line number Diff line
@@ -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) |

drivers/pnp/pnpbios/proc.c

+2 −3
Original line number Diff line number Diff line
@@ -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",