Commit 06ea8e08 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Len Brown
Browse files

ACPI: acpi_bus_unregister_driver() returns void 



Nobody looks at the return value, and this brings it into line with
pci_unregister_driver(), etc.  Also removed validation of the driver
pointer passed in to register and unregister.  More consistent, and we'll
find bugs faster if we fault rather than returning an error that's ignored.

Also makes internal functions acpi_device_unregister() and
acpi_driver_detach() void, since nobody uses their returns either.

Signed-off-by: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent e4513a57

drivers/acpi/scan.c

+10 −22
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ static void acpi_device_register(struct acpi_device *device, 
	create_sysfs_device_files(device);

}



static int acpi_device_unregister(struct acpi_device *device, int type)

static void acpi_device_unregister(struct acpi_device *device, int type)

{

	spin_lock(&acpi_device_lock);

	if (device->parent) {
@@ -158,7 +158,6 @@ static int acpi_device_unregister(struct acpi_device *device, int type) 
	acpi_detach_data(device->handle, acpi_bus_data_handler);

	remove_sysfs_device_files(device);

	kobject_unregister(&device->kobj);

	return 0;

}



void acpi_bus_data_handler(acpi_handle handle, u32 function, void *context)
@@ -577,7 +576,7 @@ static void acpi_driver_attach(struct acpi_driver *drv) 
	spin_unlock(&acpi_device_lock);

}



static int acpi_driver_detach(struct acpi_driver *drv)

static void acpi_driver_detach(struct acpi_driver *drv)

{

	struct list_head *node, *next;
@@ -599,7 +598,6 @@ static int acpi_driver_detach(struct acpi_driver *drv) 
		}

	}

	spin_unlock(&acpi_device_lock);

	return_VALUE(0);

}



/**
@@ -617,9 +615,6 @@ int acpi_bus_register_driver(struct acpi_driver *driver) 
	if (acpi_disabled)

		return_VALUE(-ENODEV);



	if (!driver)

		return_VALUE(-EINVAL);



	spin_lock(&acpi_device_lock);

	list_add_tail(&driver->node, &acpi_bus_drivers);

	spin_unlock(&acpi_device_lock);
@@ -637,13 +632,8 @@ EXPORT_SYMBOL(acpi_bus_register_driver); 
 * Unregisters a driver with the ACPI bus.  Searches the namespace for all

 * devices that match the driver's criteria and unbinds.

 */

int acpi_bus_unregister_driver(struct acpi_driver *driver)

void acpi_bus_unregister_driver(struct acpi_driver *driver)

{

	int error = 0;



	ACPI_FUNCTION_TRACE("acpi_bus_unregister_driver");



	if (driver) {

	acpi_driver_detach(driver);



	if (!atomic_read(&driver->references)) {
@@ -651,9 +641,7 @@ int acpi_bus_unregister_driver(struct acpi_driver *driver) 
		list_del_init(&driver->node);

		spin_unlock(&acpi_device_lock);

	}

	} else

		error = -EINVAL;

	return_VALUE(error);

	return;

}



EXPORT_SYMBOL(acpi_bus_unregister_driver);

include/acpi/acpi_bus.h

+1 −1
Original line number Diff line number Diff line
@@ -327,7 +327,7 @@ int acpi_bus_set_power(acpi_handle handle, int state); 
int acpi_bus_generate_event(struct acpi_device *device, u8 type, int data);

int acpi_bus_receive_event(struct acpi_bus_event *event);

int acpi_bus_register_driver(struct acpi_driver *driver);

int acpi_bus_unregister_driver(struct acpi_driver *driver);

void acpi_bus_unregister_driver(struct acpi_driver *driver);

int acpi_bus_add(struct acpi_device **child, struct acpi_device *parent,

		 acpi_handle handle, int type);

int acpi_bus_trim(struct acpi_device *start, int rmdevice);

CRA Git | Maintained and supported by SUSTech CRA and CCSE