Module Name: src
Committed By: mrg
Date: Wed Jun 9 04:20:10 UTC 2010
Modified Files:
src/sys/dev/acpi: acpi_pci.c
Log Message:
pci_chipset_tag_t is opaque - don't compare it to NULL, just use it.
shouldn't be a problem because "acpi_softc" variable isn't setup until
the "sc_pc" member is set.
fixes ia64 build. tested on amd64. ok jruoho.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/acpi/acpi_pci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/acpi/acpi_pci.c
diff -u src/sys/dev/acpi/acpi_pci.c:1.11 src/sys/dev/acpi/acpi_pci.c:1.12
--- src/sys/dev/acpi/acpi_pci.c:1.11 Mon Apr 26 13:30:31 2010
+++ src/sys/dev/acpi/acpi_pci.c Wed Jun 9 04:20:10 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_pci.c,v 1.11 2010/04/26 13:30:31 jruoho Exp $ */
+/* $NetBSD: acpi_pci.c,v 1.12 2010/06/09 04:20:10 mrg Exp $ */
/*
* Copyright (c) 2009, 2010 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_pci.c,v 1.11 2010/04/26 13:30:31 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_pci.c,v 1.12 2010/06/09 04:20:10 mrg Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -273,10 +273,7 @@
if (bus > 255 || device > 31 || function > 7)
return AE_BAD_PARAMETER;
- if (sc == NULL)
- pc = NULL;
- else
- pc = sc->sc_pc;
+ pc = sc->sc_pc;
tag = pci_make_tag(pc, bus, device, function);
