Author: kib
Date: Mon Feb 16 22:18:43 2015
New Revision: 278871
URL: https://svnweb.freebsd.org/changeset/base/278871
Log:
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
Modified:
head/sys/dev/acpica/acpi_pcib.c
Modified: head/sys/dev/acpica/acpi_pcib.c
==============================================================================
--- head/sys/dev/acpica/acpi_pcib.c Mon Feb 16 22:13:03 2015
(r278870)
+++ head/sys/dev/acpica/acpi_pcib.c Mon Feb 16 22:18:43 2015
(r278871)
@@ -95,7 +95,7 @@ prt_attach_devices(ACPI_PCI_ROUTING_TABL
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,
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,
* 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);
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
