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

Commit 348366b9 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Linus Torvalds
Browse files

PNP: add debug message for adding new device 



Add PNP debug message when adding a device, remove similar PNPACPI message
with less information.

Signed-off-by: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Cc: Adam Belay <ambx1@neo.rr.com>
Cc: Len Brown <lenb@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 36405e96

drivers/pnp/core.c

+24 −4
Original line number Diff line number Diff line
@@ -125,9 +125,11 @@ int __pnp_add_device(struct pnp_dev *dev) 
	spin_unlock(&pnp_lock);



	ret = device_register(&dev->dev);

	if (ret == 0)

		pnp_interface_attach_device(dev);

	if (ret)

		return ret;



	pnp_interface_attach_device(dev);

	return 0;

}



/*
@@ -138,12 +140,30 @@ int __pnp_add_device(struct pnp_dev *dev) 
 */

int pnp_add_device(struct pnp_dev *dev)

{

	int ret;



	if (dev->card)

		return -EINVAL;



	dev->dev.parent = &dev->protocol->dev;

	sprintf(dev->dev.bus_id, "%02x:%02x", dev->protocol->number,

		dev->number);

	return __pnp_add_device(dev);

	ret = __pnp_add_device(dev);

	if (ret)

		return ret;



#ifdef CONFIG_PNP_DEBUG

	{

		struct pnp_id *id;



		dev_printk(KERN_DEBUG, &dev->dev, "%s device, IDs",

			dev->protocol->name);

		for (id = dev->id; id; id = id->next)

			printk(" %s", id->id);

		printk(" (%s)\n", dev->active ? "active" : "disabled");

	}

#endif

	return 0;

}



void __pnp_remove_device(struct pnp_dev *dev)

drivers/pnp/pnpacpi/core.c

+0 −1
Original line number Diff line number Diff line
@@ -171,7 +171,6 @@ static int __init pnpacpi_add_device(struct acpi_device *device) 
	    is_exclusive_device(device))

		return 0;



	pnp_dbg("ACPI device : hid %s", acpi_device_hid(device));

	dev = kzalloc(sizeof(struct pnp_dev), GFP_KERNEL);

	if (!dev) {

		pnp_err("Out of memory");