From: Russell King <rmk@arm.linux.org.uk>
Date: Thu, 5 Jan 2006 14:41:37 +0000 (+0000)
Subject: [PATCH] Add pnp_bus_type probe and remove methods
X-Git-Tag: v2.6.16-rc1~164^2~12
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=4681fc320889de4591f945c4fdf08546eb9ab266;p=~emulex%2Finfiniband.git

[PATCH] Add pnp_bus_type probe and remove methods

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/pnp/driver.c b/drivers/pnp/driver.c
index 15fb758a9e5..7cafacdd12b 100644
--- a/drivers/pnp/driver.c
+++ b/drivers/pnp/driver.c
@@ -195,6 +195,8 @@ static int pnp_bus_resume(struct device *dev)
 struct bus_type pnp_bus_type = {
 	.name	= "pnp",
 	.match	= pnp_bus_match,
+	.probe	= pnp_device_probe,
+	.remove	= pnp_device_remove,
 	.suspend = pnp_bus_suspend,
 	.resume = pnp_bus_resume,
 };
@@ -215,8 +217,6 @@ int pnp_register_driver(struct pnp_driver *drv)
 
 	drv->driver.name = drv->name;
 	drv->driver.bus = &pnp_bus_type;
-	drv->driver.probe = pnp_device_probe;
-	drv->driver.remove = pnp_device_remove;
 
 	count = driver_register(&drv->driver);