Re: [PATCH] return number of devices claimed from acpi_bus_register_driver()

pnp_register_driver() and pci_register_driver() return the number of
devices claimed by the driver.  This makes acpi_bus_register_driver()
do the same.

All existing callers of acpi_bus_register_driver() either ignore the
return value or check only for negative (error) return values.

Signed-off-by: Bjorn Helgaas <redacted>

===== drivers/acpi/scan.c 1.28 vs edited =====

--- 1.28/drivers/acpi/scan.c    2004-06-30 09:55:20 -06:00
+++ edited/drivers/acpi/scan.c  2004-07-29 11:43:17 -06:00

@@ -276,6 +276,7 @@
 static int acpi_driver_attach(struct acpi_driver * drv)
 {
        struct list_head * node, * next;
+       int count = 0;
 
        ACPI_FUNCTION_TRACE("acpi_driver_attach");
 

@@ -290,6 +291,7 @@
                if (!acpi_bus_match(dev, drv)) {
                        if (!acpi_bus_driver_init(dev, drv)) {
                                atomic_inc(&drv->references);
+                               count++;
                                ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Found

driver [%s] for device [%s]\n",
                                                  drv->name,
dev->pnp.bus_id));
                        }

@@ -297,7 +299,7 @@
                spin_lock(&acpi_device_lock);
        }
        spin_unlock(&acpi_device_lock);
-       return_VALUE(0);
+       return_VALUE(count);
 }
 
 static int acpi_driver_detach(struct acpi_driver * drv)

@@ -328,28 +330,30 @@
  * acpi_bus_register_driver 
  * ------------------------ 
  * Registers a driver with the ACPI bus.  Searches the namespace for

all
- * devices that match the driver's criteria and binds.
+ * devices that match the driver's criteria and binds.  Returns the
+ * number of devices that were claimed by the driver, or a negative
+ * error status for failure.
  */
 int
 acpi_bus_register_driver (
        struct acpi_driver      *driver)
 {
-       int error = 0;
+       int count;
 
        ACPI_FUNCTION_TRACE("acpi_bus_register_driver");
 
        if (acpi_disabled)
                return_VALUE(-ENODEV);
 
-       if (driver) {
-               spin_lock(&acpi_device_lock);
-               list_add_tail(&driver->node, &acpi_bus_drivers);
-               spin_unlock(&acpi_device_lock);
-               acpi_driver_attach(driver);
-       } else
-               error = -EINVAL;
+       if (!driver)
+               return_VALUE(-EINVAL);
+
+       spin_lock(&acpi_device_lock);
+       list_add_tail(&driver->node, &acpi_bus_drivers);
+       spin_unlock(&acpi_device_lock);
+       count = acpi_driver_attach(driver);
 
-       return_VALUE(error);
+       return_VALUE(count);
 }