Changeset View
Changeset View
Standalone View
Standalone View
sys/dev/acpica/acpi_pci_link.c
Show First 20 Lines • Show All 140 Lines • ▼ Show 20 Lines | acpi_short_name(ACPI_HANDLE handle, char *buffer, size_t buflen) | ||||
buf.Pointer = buffer; | buf.Pointer = buffer; | ||||
return (AcpiGetName(handle, ACPI_SINGLE_NAME, &buf)); | return (AcpiGetName(handle, ACPI_SINGLE_NAME, &buf)); | ||||
} | } | ||||
static int | static int | ||||
acpi_pci_link_probe(device_t dev) | acpi_pci_link_probe(device_t dev) | ||||
{ | { | ||||
char descr[28], name[12]; | char descr[28], name[12]; | ||||
int rv; | |||||
/* | /* | ||||
* We explicitly do not check _STA since not all systems set it to | * We explicitly do not check _STA since not all systems set it to | ||||
* sensible values. | * sensible values. | ||||
*/ | */ | ||||
if (acpi_disabled("pci_link") || | if (acpi_disabled("pci_link")) | ||||
ACPI_ID_PROBE(device_get_parent(dev), dev, pci_link_ids) == NULL) | |||||
return (ENXIO); | return (ENXIO); | ||||
rv = ACPI_ID_PROBE(device_get_parent(dev), dev, pci_link_ids, NULL); | |||||
if (rv > 0) | |||||
return (rv); | |||||
jhb: return (rv) perhaps? That seems more consistent with your other changes. | |||||
if (ACPI_SUCCESS(acpi_short_name(acpi_get_handle(dev), name, | if (ACPI_SUCCESS(acpi_short_name(acpi_get_handle(dev), name, | ||||
sizeof(name)))) { | sizeof(name)))) { | ||||
snprintf(descr, sizeof(descr), "ACPI PCI Link %s", name); | snprintf(descr, sizeof(descr), "ACPI PCI Link %s", name); | ||||
device_set_desc_copy(dev, descr); | device_set_desc_copy(dev, descr); | ||||
} else | } else | ||||
device_set_desc(dev, "ACPI PCI Link"); | device_set_desc(dev, "ACPI PCI Link"); | ||||
device_quiet(dev); | device_quiet(dev); | ||||
return (0); | return (rv); | ||||
} | } | ||||
static ACPI_STATUS | static ACPI_STATUS | ||||
acpi_count_irq_resources(ACPI_RESOURCE *res, void *context) | acpi_count_irq_resources(ACPI_RESOURCE *res, void *context) | ||||
{ | { | ||||
struct link_count_request *req; | struct link_count_request *req; | ||||
req = (struct link_count_request *)context; | req = (struct link_count_request *)context; | ||||
▲ Show 20 Lines • Show All 950 Lines • Show Last 20 Lines |
return (rv) perhaps? That seems more consistent with your other changes.