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

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
...@@ -125,9 +125,11 @@ int __pnp_add_device(struct pnp_dev *dev) ...@@ -125,9 +125,11 @@ int __pnp_add_device(struct pnp_dev *dev)
spin_unlock(&pnp_lock); spin_unlock(&pnp_lock);
ret = device_register(&dev->dev); ret = device_register(&dev->dev);
if (ret == 0) if (ret)
pnp_interface_attach_device(dev); return ret;
return ret;
pnp_interface_attach_device(dev);
return 0;
} }
/* /*
...@@ -138,12 +140,30 @@ int __pnp_add_device(struct pnp_dev *dev) ...@@ -138,12 +140,30 @@ int __pnp_add_device(struct pnp_dev *dev)
*/ */
int pnp_add_device(struct pnp_dev *dev) int pnp_add_device(struct pnp_dev *dev)
{ {
int ret;
if (dev->card) if (dev->card)
return -EINVAL; return -EINVAL;
dev->dev.parent = &dev->protocol->dev; dev->dev.parent = &dev->protocol->dev;
sprintf(dev->dev.bus_id, "%02x:%02x", dev->protocol->number, sprintf(dev->dev.bus_id, "%02x:%02x", dev->protocol->number,
dev->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) void __pnp_remove_device(struct pnp_dev *dev)
......
...@@ -171,7 +171,6 @@ static int __init pnpacpi_add_device(struct acpi_device *device) ...@@ -171,7 +171,6 @@ static int __init pnpacpi_add_device(struct acpi_device *device)
is_exclusive_device(device)) is_exclusive_device(device))
return 0; return 0;
pnp_dbg("ACPI device : hid %s", acpi_device_hid(device));
dev = kzalloc(sizeof(struct pnp_dev), GFP_KERNEL); dev = kzalloc(sizeof(struct pnp_dev), GFP_KERNEL);
if (!dev) { if (!dev) {
pnp_err("Out of memory"); pnp_err("Out of memory");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment