Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6

4 files changed, 22 insertions, 6 deletions

diff --git a/drivers/base/dd.c b/drivers/base/dd.c
index 2b905016664d..730a9ce0a14a 100644
--- a/drivers/base/dd.c
+++ b/drivers/base/dd.c
@@ -78,7 +78,13 @@ int driver_probe_device(struct device_driver * drv, struct device * dev)
         pr_debug("%s: Matched Device %s with Driver %s\n",
                  drv->bus->name, dev->bus_id, drv->name);
         dev->driver = drv;
-        if (drv->probe) {
+        if (dev->bus->probe) {
+                ret = dev->bus->probe(dev);
+                if (ret) {
+                        dev->driver = NULL;
+                        goto ProbeFailed;
+                }
+        } else if (drv->probe) {
                 ret = drv->probe(dev);
                 if (ret) {
                         dev->driver = NULL;
@@ -203,7 +209,9 @@ static void __device_release_driver(struct device * dev)
                 sysfs_remove_link(&dev->kobj, "driver");
                 klist_remove(&dev->knode_driver);
 
-                if (drv->remove)
+                if (dev->bus->remove)
+                        dev->bus->remove(dev);
+                else if (drv->remove)
                         drv->remove(dev);
                 dev->driver = NULL;
                 put_driver(drv);
diff --git a/drivers/base/driver.c b/drivers/base/driver.c
index 161f3a390d90..b400314e1c62 100644
--- a/drivers/base/driver.c
+++ b/drivers/base/driver.c
@@ -171,6 +171,11 @@ static void klist_devices_put(struct klist_node *n)
  */
 int driver_register(struct device_driver * drv)
 {
+        if ((drv->bus->probe && drv->probe) ||
+            (drv->bus->remove && drv->remove) ||
+            (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);
         init_completion(&drv->unloaded);
         return bus_add_driver(drv);
diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index 0f81731bdfa8..461554a02517 100644
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -327,7 +327,7 @@ EXPORT_SYMBOL_GPL(platform_device_register);
  *      @pdev:  platform device we're unregistering
  *
  *      Unregistration is done in 2 steps. Fisrt we release all resources
- *      and remove it from the sybsystem, then we drop reference count by
+ *      and remove it from the subsystem, then we drop reference count by
  *      calling platform_device_put().
  */
 void platform_device_unregister(struct platform_device * pdev)
diff --git a/drivers/base/power/shutdown.c b/drivers/base/power/shutdown.c
index f50a08be424b..c2475f3134ea 100644
--- a/drivers/base/power/shutdown.c
+++ b/drivers/base/power/shutdown.c
@@ -35,12 +35,15 @@ extern int sysdev_shutdown(void);
  */
 void device_shutdown(void)
 {
-        struct device * dev;
+        struct device * dev, *devn;
 
         down_write(&devices_subsys.rwsem);
-        list_for_each_entry_reverse(dev, &devices_subsys.kset.list,
+        list_for_each_entry_safe_reverse(dev, devn, &devices_subsys.kset.list,
                                 kobj.entry) {
-                if (dev->driver && dev->driver->shutdown) {
+                if (dev->bus && dev->bus->shutdown) {
+                        dev_dbg(dev, "shutdown\n");
+                        dev->bus->shutdown(dev);
+                } else if (dev->driver && dev->driver->shutdown) {
                         dev_dbg(dev, "shutdown\n");
                         dev->driver->shutdown(dev);
                 }