[PATCH] pnp: PNP: adjust pnp_register_driver signature

Remove the assumption that pnp_register_driver() returns the number of devices
claimed.  Returning the count is unreliable because devices may be hot-plugged
in the future.

This changes the convention to "zero for success, or a negative error value,"
which matches pci_register_driver(), acpi_bus_register_driver(), and
platform_driver_register().

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Cc: Adam Belay <ambx1@neo.rr.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 1 insertions, 18 deletions

diff --git a/drivers/pnp/driver.c b/drivers/pnp/driver.c
index 7cafacdd12b0..e54c15383193 100644
--- a/drivers/pnp/driver.c
+++ b/drivers/pnp/driver.c
@@ -201,31 +201,14 @@ struct bus_type pnp_bus_type = {
         .resume = pnp_bus_resume,
 };
 
-
-static int count_devices(struct device * dev, void * c)
-{
-        int * count = c;
-        (*count)++;
-        return 0;
-}
-
 int pnp_register_driver(struct pnp_driver *drv)
 {
-        int count;
-
         pnp_dbg("the driver '%s' has been registered", drv->name);
 
         drv->driver.name = drv->name;
         drv->driver.bus = &pnp_bus_type;
 
-        count = driver_register(&drv->driver);
-
-        /* get the number of initial matches */
-        if (count >= 0){
-                count = 0;
-                driver_for_each_device(&drv->driver, NULL, &count, count_devices);
-        }
-        return count;
+        return driver_register(&drv->driver);
 }
 
 void pnp_unregister_driver(struct pnp_driver *drv)