[PATCH] hp300: fix driver_register() return handling, remove dio_module_init()

Remove the assumption that driver_register() returns the number of devices
bound to the driver.  In fact, it returns zero for success or a negative
error value.

dio_module_init() used the device count to automatically unregister and
unload drivers that found no devices.  That might have worked at one time,
but has been broken for some time because dio_register_driver() returned
either a negative error or a positive count (never zero).  So it could only
unregister on failure, when it's not needed anyway.

This functionality could be resurrected in individual drivers by counting
devices in their .probe() methods.

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Cc: Philip Blundell <philb@gnu.org>
Cc: Jochen Friedrich <jochen@scram.de>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 2 insertions, 7 deletions

diff --git a/drivers/dio/dio-driver.c b/drivers/dio/dio-driver.c
index ca8e69d2f64d..e4c48e329367 100644
--- a/drivers/dio/dio-driver.c
+++ b/drivers/dio/dio-driver.c
@@ -71,22 +71,17 @@ static int dio_device_probe(struct device *dev)
          *  @drv: the driver structure to register
          *
          *  Adds the driver structure to the list of registered drivers
-         *  Returns the number of DIO devices which were claimed by the driver
-         *  during registration.  The driver remains registered even if the
-         *  return value is zero.
+         *  Returns zero or a negative error value.
          */
 
 int dio_register_driver(struct dio_driver *drv)
 {
-        int count = 0;
-
         /* initialize common driver fields */
         drv->driver.name = drv->name;
         drv->driver.bus = &dio_bus_type;
 
         /* register with core */
-        count = driver_register(&drv->driver);
-        return count ? count : 1;
+        return driver_register(&drv->driver);
 }