diff options
Diffstat (limited to 'drivers/acpi/acpica/evrgnini.c')
| -rw-r--r-- | drivers/acpi/acpica/evrgnini.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/drivers/acpi/acpica/evrgnini.c b/drivers/acpi/acpica/evrgnini.c index f3f1fb45c3dc..284a7becbe96 100644 --- a/drivers/acpi/acpica/evrgnini.c +++ b/drivers/acpi/acpica/evrgnini.c | |||
| @@ -241,7 +241,8 @@ acpi_ev_pci_config_region_setup(acpi_handle handle, | |||
| 241 | status = AE_OK; | 241 | status = AE_OK; |
| 242 | } else { | 242 | } else { |
| 243 | ACPI_EXCEPTION((AE_INFO, status, | 243 | ACPI_EXCEPTION((AE_INFO, status, |
| 244 | "Could not install PciConfig handler for Root Bridge %4.4s", | 244 | "Could not install PciConfig handler " |
| 245 | "for Root Bridge %4.4s", | ||
| 245 | acpi_ut_get_node_name | 246 | acpi_ut_get_node_name |
| 246 | (pci_root_node))); | 247 | (pci_root_node))); |
| 247 | } | 248 | } |
| @@ -293,9 +294,8 @@ acpi_ev_pci_config_region_setup(acpi_handle handle, | |||
| 293 | * Get the PCI device and function numbers from the _ADR object contained | 294 | * Get the PCI device and function numbers from the _ADR object contained |
| 294 | * in the parent's scope. | 295 | * in the parent's scope. |
| 295 | */ | 296 | */ |
| 296 | status = | 297 | status = acpi_ut_evaluate_numeric_object(METHOD_NAME__ADR, |
| 297 | acpi_ut_evaluate_numeric_object(METHOD_NAME__ADR, pci_device_node, | 298 | pci_device_node, &pci_value); |
| 298 | &pci_value); | ||
| 299 | 299 | ||
| 300 | /* | 300 | /* |
| 301 | * The default is zero, and since the allocation above zeroed the data, | 301 | * The default is zero, and since the allocation above zeroed the data, |
| @@ -308,18 +308,16 @@ acpi_ev_pci_config_region_setup(acpi_handle handle, | |||
| 308 | 308 | ||
| 309 | /* The PCI segment number comes from the _SEG method */ | 309 | /* The PCI segment number comes from the _SEG method */ |
| 310 | 310 | ||
| 311 | status = | 311 | status = acpi_ut_evaluate_numeric_object(METHOD_NAME__SEG, |
| 312 | acpi_ut_evaluate_numeric_object(METHOD_NAME__SEG, pci_root_node, | 312 | pci_root_node, &pci_value); |
| 313 | &pci_value); | ||
| 314 | if (ACPI_SUCCESS(status)) { | 313 | if (ACPI_SUCCESS(status)) { |
| 315 | pci_id->segment = ACPI_LOWORD(pci_value); | 314 | pci_id->segment = ACPI_LOWORD(pci_value); |
| 316 | } | 315 | } |
| 317 | 316 | ||
| 318 | /* The PCI bus number comes from the _BBN method */ | 317 | /* The PCI bus number comes from the _BBN method */ |
| 319 | 318 | ||
| 320 | status = | 319 | status = acpi_ut_evaluate_numeric_object(METHOD_NAME__BBN, |
| 321 | acpi_ut_evaluate_numeric_object(METHOD_NAME__BBN, pci_root_node, | 320 | pci_root_node, &pci_value); |
| 322 | &pci_value); | ||
| 323 | if (ACPI_SUCCESS(status)) { | 321 | if (ACPI_SUCCESS(status)) { |
| 324 | pci_id->bus = ACPI_LOWORD(pci_value); | 322 | pci_id->bus = ACPI_LOWORD(pci_value); |
| 325 | } | 323 | } |
| @@ -632,8 +630,8 @@ acpi_ev_initialize_region(union acpi_operand_object *region_obj, | |||
| 632 | acpi_ns_locked); | 630 | acpi_ns_locked); |
| 633 | 631 | ||
| 634 | /* | 632 | /* |
| 635 | * Tell all users that this region is usable by running the _REG | 633 | * Tell all users that this region is usable by |
| 636 | * method | 634 | * running the _REG method |
| 637 | */ | 635 | */ |
| 638 | if (acpi_ns_locked) { | 636 | if (acpi_ns_locked) { |
| 639 | status = | 637 | status = |
