diff options
author | kib <kib@FreeBSD.org> | 2015-02-16 22:18:43 +0000 |
---|---|---|
committer | kib <kib@FreeBSD.org> | 2015-02-16 22:18:43 +0000 |
commit | e8f9899e24c53b652efba226ff48da0bd5b286ab (patch) | |
tree | 8636f80e5faa2c6a46f76d8459ae10988eb018ab | |
parent | c837ced420d36bb44aa12f15749bc30169acadb1 (diff) | |
download | FreeBSD-src-e8f9899e24c53b652efba226ff48da0bd5b286ab.zip FreeBSD-src-e8f9899e24c53b652efba226ff48da0bd5b286ab.tar.gz |
Array cannot be NULL, remove always true comparision. ACPI spec
identifies the tested condition for _PRT as "BYTE value of 0", so the
remaining part of the conditionals is sufficient.
Sponsored by: The FreeBSD Foundation
MFC after: 1 week
-rw-r--r-- | sys/dev/acpica/acpi_pcib.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sys/dev/acpica/acpi_pcib.c b/sys/dev/acpica/acpi_pcib.c index c4bded8..93dada5 100644 --- a/sys/dev/acpica/acpi_pcib.c +++ b/sys/dev/acpica/acpi_pcib.c @@ -95,7 +95,7 @@ prt_attach_devices(ACPI_PCI_ROUTING_TABLE *entry, void *arg) int error; /* We only care about entries that reference a link device. */ - if (entry->Source == NULL || entry->Source[0] == '\0') + if (entry->Source[0] == '\0') return; /* @@ -222,7 +222,7 @@ acpi_pcib_route_interrupt(device_t pcib, device_t dev, int pin, if (bootverbose) { device_printf(pcib, "matched entry for %d.%d.INT%c", pci_get_bus(dev), pci_get_slot(dev), 'A' + pin); - if (prt->Source != NULL && prt->Source[0] != '\0') + if (prt->Source[0] != '\0') printf(" (src %s:%u)", prt->Source, prt->SourceIndex); printf("\n"); } @@ -234,8 +234,7 @@ acpi_pcib_route_interrupt(device_t pcib, device_t dev, int pin, * XXX: If the source index is non-zero, ignore the source device and * assume that this is a hard-wired entry. */ - if (prt->Source == NULL || prt->Source[0] == '\0' || - prt->SourceIndex != 0) { + if (prt->Source[0] == '\0' || prt->SourceIndex != 0) { if (bootverbose) device_printf(pcib, "slot %d INT%c hardwired to IRQ %d\n", pci_get_slot(dev), 'A' + pin, prt->SourceIndex); |