Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee13...

[pandora-kernel.git] / drivers / base / driver.c

diff --git a/drivers/base/driver.c b/drivers/base/driver.c
index b400314..1214cbd 100644 (file)
--- a/drivers/base/driver.c
+++ b/drivers/base/driver.c
@@ -8,7 +8,6 @@
  *
  */
 
-#include <linux/config.h>
 #include <linux/device.h>
 #include <linux/module.h>
 #include <linux/errno.h>
@@ -143,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
@@ -176,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);
 }