diff options
| author | Bjorn Helgaas <bjorn.helgaas@hp.com> | 2009-09-21 19:29:25 +0000 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-09-25 14:24:26 -0400 |
| commit | c7bcb4e98aca348f6f8ab432496ff35ba7a49a1d (patch) | |
| tree | a5ee22848e13cb150a676a12f9c0f6a631d3f80c /drivers/acpi/scan.c | |
| parent | bc3b07726aa288e2a5e60d9a1dd8188b3faa7385 (diff) | |
| download | lwn-c7bcb4e98aca348f6f8ab432496ff35ba7a49a1d.tar.gz lwn-c7bcb4e98aca348f6f8ab432496ff35ba7a49a1d.zip | |
ACPI: remove redundant "type" arguments
We now save the ACPI bus "device_type" in the acpi_device structure, so
we don't need to pass it around explicitly anymore.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/scan.c')
| -rw-r--r-- | drivers/acpi/scan.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 44383fe35082..6c83342d13d5 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -916,7 +916,7 @@ static int acpi_bus_get_flags(struct acpi_device *device) return 0; } -static void acpi_device_get_busid(struct acpi_device *device, int type) +static void acpi_device_get_busid(struct acpi_device *device) { char bus_id[5] = { '?', 0 }; struct acpi_buffer buffer = { sizeof(bus_id), bus_id }; @@ -928,7 +928,7 @@ static void acpi_device_get_busid(struct acpi_device *device, int type) * The device's Bus ID is simply the object name. * TBD: Shouldn't this value be unique (within the ACPI namespace)? */ - switch (type) { + switch (device->device_type) { case ACPI_BUS_TYPE_SYSTEM: strcpy(device->pnp.bus_id, "ACPI"); break; @@ -1055,7 +1055,7 @@ acpi_add_cid( return cid; } -static void acpi_device_set_id(struct acpi_device *device, int type) +static void acpi_device_set_id(struct acpi_device *device) { struct acpi_device_info *info = NULL; char *hid = NULL; @@ -1064,7 +1064,7 @@ static void acpi_device_set_id(struct acpi_device *device, int type) char *cid_add = NULL; acpi_status status; - switch (type) { + switch (device->device_type) { case ACPI_BUS_TYPE_DEVICE: status = acpi_get_object_info(device->handle, &info); if (ACPI_FAILURE(status)) { @@ -1122,7 +1122,7 @@ static void acpi_device_set_id(struct acpi_device *device, int type) * Fix for the system root bus device -- the only root-level device. */ if (((acpi_handle)device->parent == ACPI_ROOT_OBJECT) && - (type == ACPI_BUS_TYPE_DEVICE)) { + (device->device_type == ACPI_BUS_TYPE_DEVICE)) { hid = ACPI_BUS_HID; strcpy(device->pnp.device_name, ACPI_BUS_DEVICE_NAME); strcpy(device->pnp.device_class, ACPI_BUS_CLASS); @@ -1241,7 +1241,7 @@ acpi_add_single_object(struct acpi_device **child, device->parent = parent; device->bus_ops = *ops; /* workround for not call .start */ - acpi_device_get_busid(device, type); + acpi_device_get_busid(device); /* * Flags @@ -1304,7 +1304,7 @@ acpi_add_single_object(struct acpi_device **child, * Hardware ID, Unique ID, & Bus Address * ------------------------------------- */ - acpi_device_set_id(device, type); + acpi_device_set_id(device); /* * Power Management |