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

4 files changed, 30 insertions, 28 deletions

diff --git a/arch/arm/common/locomo.c b/arch/arm/common/locomo.c
index 1b7eaab02b9e..159ad7ed7a40 100644
--- a/arch/arm/common/locomo.c
+++ b/arch/arm/common/locomo.c
@@ -1103,14 +1103,14 @@ static int locomo_bus_remove(struct device *dev)
 struct bus_type locomo_bus_type = {
         .name           = "locomo-bus",
         .match          = locomo_match,
+        .probe          = locomo_bus_probe,
+        .remove         = locomo_bus_remove,
         .suspend        = locomo_bus_suspend,
         .resume         = locomo_bus_resume,
 };
 
 int locomo_driver_register(struct locomo_driver *driver)
 {
-        driver->drv.probe = locomo_bus_probe;
-        driver->drv.remove = locomo_bus_remove;
         driver->drv.bus = &locomo_bus_type;
         return driver_register(&driver->drv);
 }
diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c
index d0d6e6d2d649..1475089f9b42 100644
--- a/arch/arm/common/sa1111.c
+++ b/arch/arm/common/sa1111.c
@@ -1247,14 +1247,14 @@ static int sa1111_bus_remove(struct device *dev)
 struct bus_type sa1111_bus_type = {
         .name           = "sa1111-rab",
         .match          = sa1111_match,
+        .probe          = sa1111_bus_probe,
+        .remove         = sa1111_bus_remove,
         .suspend        = sa1111_bus_suspend,
         .resume         = sa1111_bus_resume,
 };
 
 int sa1111_driver_register(struct sa1111_driver *driver)
 {
-        driver->drv.probe = sa1111_bus_probe;
-        driver->drv.remove = sa1111_bus_remove;
         driver->drv.bus = &sa1111_bus_type;
         return driver_register(&driver->drv);
 }
diff --git a/arch/arm/kernel/ecard.c b/arch/arm/kernel/ecard.c
index 96fd91926c9b..74ea29c3205e 100644
--- a/arch/arm/kernel/ecard.c
+++ b/arch/arm/kernel/ecard.c
@@ -1147,9 +1147,11 @@ static void ecard_drv_shutdown(struct device *dev)
         struct ecard_driver *drv = ECARD_DRV(dev->driver);
         struct ecard_request req;
 
-        if (drv->shutdown)
-                drv->shutdown(ec);
-        ecard_release(ec);
+        if (dev->driver) {
+                if (drv->shutdown)
+                        drv->shutdown(ec);
+                ecard_release(ec);
+        }
 
         /*
          * If this card has a loader, call the reset handler.
@@ -1164,9 +1166,6 @@ static void ecard_drv_shutdown(struct device *dev)
 int ecard_register_driver(struct ecard_driver *drv)
 {
         drv->drv.bus = &ecard_bus_type;
-        drv->drv.probe = ecard_drv_probe;
-        drv->drv.remove = ecard_drv_remove;
-        drv->drv.shutdown = ecard_drv_shutdown;
 
         return driver_register(&drv->drv);
 }
@@ -1195,6 +1194,9 @@ struct bus_type ecard_bus_type = {
         .name           = "ecard",
         .dev_attrs      = ecard_dev_attrs,
         .match          = ecard_match,
+        .probe          = ecard_drv_probe,
+        .remove         = ecard_drv_remove,
+        .shutdown       = ecard_drv_shutdown,
 };
 
 static int ecard_bus_init(void)
diff --git a/arch/arm/mach-integrator/lm.c b/arch/arm/mach-integrator/lm.c
index 5b41e3a724e1..622cdc4212dd 100644
--- a/arch/arm/mach-integrator/lm.c
+++ b/arch/arm/mach-integrator/lm.c
@@ -22,20 +22,6 @@ static int lm_match(struct device *dev, struct device_driver *drv)
         return 1;
 }
 
-static struct bus_type lm_bustype = {
-        .name           = "logicmodule",
-        .match          = lm_match,
-//      .suspend        = lm_suspend,
-//      .resume         = lm_resume,
-};
-
-static int __init lm_init(void)
-{
-        return bus_register(&lm_bustype);
-}
-
-postcore_initcall(lm_init);
-
 static int lm_bus_probe(struct device *dev)
 {
         struct lm_device *lmdev = to_lm_device(dev);
@@ -49,16 +35,30 @@ static int lm_bus_remove(struct device *dev)
         struct lm_device *lmdev = to_lm_device(dev);
         struct lm_driver *lmdrv = to_lm_driver(dev->driver);
 
-        lmdrv->remove(lmdev);
+        if (lmdrv->remove)
+                lmdrv->remove(lmdev);
         return 0;
 }
 
+static struct bus_type lm_bustype = {
+        .name           = "logicmodule",
+        .match          = lm_match,
+        .probe          = lm_bus_probe,
+        .remove         = lm_bus_remove,
+//      .suspend        = lm_bus_suspend,
+//      .resume         = lm_bus_resume,
+};
+
+static int __init lm_init(void)
+{
+        return bus_register(&lm_bustype);
+}
+
+postcore_initcall(lm_init);
+
 int lm_driver_register(struct lm_driver *drv)
 {
         drv->drv.bus = &lm_bustype;
-        drv->drv.probe = lm_bus_probe;
-        drv->drv.remove = lm_bus_remove;
-
         return driver_register(&drv->drv);
 }