From 8a89efd18aa15bb832778baa4e6eee3857ecada4 Mon Sep 17 00:00:00 2001 From: Drew Moseley Date: Sun, 28 Sep 2008 01:31:35 +0200 Subject: PNP: create device attributes via default device attributes This creates the attributes before the uevent is sent. Signed-off-by: Drew Moseley Acked-by: Kay Sievers Signed-off-by: Greg Kroah-Hartman --- drivers/pnp/core.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'drivers/pnp/core.c') diff --git a/drivers/pnp/core.c b/drivers/pnp/core.c index a411582bcd72..7d65da821229 100644 --- a/drivers/pnp/core.c +++ b/drivers/pnp/core.c @@ -159,21 +159,13 @@ struct pnp_dev *pnp_alloc_dev(struct pnp_protocol *protocol, int id, char *pnpid int __pnp_add_device(struct pnp_dev *dev) { - int ret; - pnp_fixup_device(dev); dev->status = PNP_READY; spin_lock(&pnp_lock); list_add_tail(&dev->global_list, &pnp_global); list_add_tail(&dev->protocol_list, &dev->protocol->devices); spin_unlock(&pnp_lock); - - ret = device_register(&dev->dev); - if (ret) - return ret; - - pnp_interface_attach_device(dev); - return 0; + return device_register(&dev->dev); } /* -- cgit v1.2.3-58-ga151 From a63cc18f02b941662ca5f6c33adca1aa9e8c1a96 Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Wed, 15 Oct 2008 22:03:57 -0700 Subject: pnp: remove printk() with outdated version There's no point in printing some ancient version number forever. Signed-off-by: Adrian Bunk Acked-by: Rene Herman Acked-by: Bjorn Helgaas Acked-by: Adam M Belay Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- drivers/pnp/core.c | 1 - 1 file changed, 1 deletion(-) (limited to 'drivers/pnp/core.c') diff --git a/drivers/pnp/core.c b/drivers/pnp/core.c index a411582bcd72..cc0aeaed6179 100644 --- a/drivers/pnp/core.c +++ b/drivers/pnp/core.c @@ -218,7 +218,6 @@ void __pnp_remove_device(struct pnp_dev *dev) static int __init pnp_init(void) { - printk(KERN_INFO "Linux Plug and Play Support v0.97 (c) Adam Belay\n"); return bus_register(&pnp_bus_type); } -- cgit v1.2.3-58-ga151