renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-22 12:14:01 +08:00
Code

ACPI: simplify scan.c coding

Browse Source 
No functional changes; just remove leftover, unused "buffer" and simplify
control flow (no need to remember error values and goto the end, when we can
simply return the value directly).

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Bjorn Helgaas 2006-03-28 17:04:00 -05:00 committed by Len Brown
parent 683aa4012f
commit 1a36561607
1 changed files with 13 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
drivers/acpi/scan.c
View File

@ -234,12 +234,9 @@ static int acpi_bus_get_power_flags(struct acpi_device *device)
int acpi_match_ids(struct acpi_device *device, char *ids)
{
int error = 0;
struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
if (device->flags.hardware_id)
if (strstr(ids, device->pnp.hardware_id))
goto Done;
return 0;
if (device->flags.compatible_ids) {
struct acpi_compatible_id_list *cid_list = device->pnp.cid_list;
@ -248,15 +245,10 @@ int acpi_match_ids(struct acpi_device *device, char *ids)
/* compare multiple _CID entries against driver ids */
for (i = 0; i < cid_list->count; i++) {
if (strstr(ids, cid_list->id[i].value))
goto Done;
return 0;
}
}
error = -ENOENT;
Done:
if (buffer.pointer)
acpi_os_free(buffer.pointer);
return error;
return -ENOENT;
}
static acpi_status
@ -645,21 +637,19 @@ EXPORT_SYMBOL(acpi_bus_register_driver);
*/
int 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 (!driver)
return_VALUE(-EINVAL);
if (!atomic_read(&driver->references)) {
spin_lock(&acpi_device_lock);
list_del_init(&driver->node);
spin_unlock(&acpi_device_lock);
}
} else
error = -EINVAL;
return_VALUE(error);
acpi_driver_detach(driver);
if (!atomic_read(&driver->references)) {
spin_lock(&acpi_device_lock);
list_del_init(&driver->node);
spin_unlock(&acpi_device_lock);
}
return_VALUE(0);
}
EXPORT_SYMBOL(acpi_bus_unregister_driver);