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

2 files changed, 6 insertions, 6 deletions

diff --git a/arch/powerpc/kernel/of_device.c b/arch/powerpc/kernel/of_device.c
index 7065e40e2f4..22d83d4d1af 100644
--- a/arch/powerpc/kernel/of_device.c
+++ b/arch/powerpc/kernel/of_device.c
@@ -132,6 +132,8 @@ static int of_device_resume(struct device * dev)
 struct bus_type of_platform_bus_type = {
        .name    = "of_platform",
        .match   = of_platform_bus_match,
+       .probe   = of_device_probe,
+       .remove  = of_device_remove,
        .suspend = of_device_suspend,
        .resume  = of_device_resume,
 };
@@ -150,8 +152,6 @@ int of_register_driver(struct of_platform_driver *drv)
         /* initialize common driver fields */
         drv->driver.name = drv->name;
         drv->driver.bus = &of_platform_bus_type;
-        drv->driver.probe = of_device_probe;
-        drv->driver.remove = of_device_remove;
 
         /* register with core */
         count = driver_register(&drv->driver);
diff --git a/arch/powerpc/kernel/vio.c b/arch/powerpc/kernel/vio.c
index 13c41495fe0..13c655ba284 100644
--- a/arch/powerpc/kernel/vio.c
+++ b/arch/powerpc/kernel/vio.c
@@ -76,7 +76,7 @@ static void vio_bus_shutdown(struct device *dev)
         struct vio_dev *viodev = to_vio_dev(dev);
         struct vio_driver *viodrv = to_vio_driver(dev->driver);
 
-        if (viodrv->shutdown)
+        if (dev->driver && viodrv->shutdown)
                 viodrv->shutdown(viodev);
 }
 
@@ -91,9 +91,6 @@ int vio_register_driver(struct vio_driver *viodrv)
 
         /* fill in 'struct driver' fields */
         viodrv->driver.bus = &vio_bus_type;
-        viodrv->driver.probe = vio_bus_probe;
-        viodrv->driver.remove = vio_bus_remove;
-        viodrv->driver.shutdown = vio_bus_shutdown;
 
         return driver_register(&viodrv->driver);
 }
@@ -295,4 +292,7 @@ struct bus_type vio_bus_type = {
         .name = "vio",
         .uevent = vio_hotplug,
         .match = vio_bus_match,
+        .probe = vio_bus_probe,
+        .remove = vio_bus_remove,
+        .shutdown = vio_bus_shutdown,
 };