Merge branch 'master' into gfs2

1 files changed, 1 insertions, 15 deletions

diff --git a/drivers/base/driver.c b/drivers/base/driver.c
index 562600dd540a..1214cbd17d86 100644
--- a/drivers/base/driver.c
+++ b/drivers/base/driver.c
@@ -142,20 +142,6 @@ void put_driver(struct device_driver * drv)
         kobject_put(&drv->kobj);
 }
 
-static void klist_devices_get(struct klist_node *n)
-{
-        struct device *dev = container_of(n, struct device, knode_driver);
-
-        get_device(dev);
-}
-
-static void klist_devices_put(struct klist_node *n)
-{
-        struct device *dev = container_of(n, struct device, knode_driver);
-
-        put_device(dev);
-}
-
 /**
  *      driver_register - register driver with bus
  *      @drv:   driver to register
@@ -175,7 +161,7 @@ int driver_register(struct device_driver * drv)
             (drv->bus->shutdown && drv->shutdown)) {
                 printk(KERN_WARNING "Driver '%s' needs updating - please use bus_type methods\n", drv->name);
         }
-        klist_init(&drv->klist_devices, klist_devices_get, klist_devices_put);
+        klist_init(&drv->klist_devices, NULL, NULL);
         init_completion(&drv->unloaded);
         return bus_add_driver(drv);
 }