Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/acpi pci_chipset_tag_t is opaque - don't compare it ...



details:   https://anonhg.NetBSD.org/src/rev/226aaf5379ad
branches:  trunk
changeset: 755546:226aaf5379ad
user:      mrg <mrg%NetBSD.org@localhost>
date:      Wed Jun 09 04:20:10 2010 +0000

description:
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.

diffstat:

 sys/dev/acpi/acpi_pci.c |  9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diffs (30 lines):

diff -r c84c194e9c3c -r 226aaf5379ad sys/dev/acpi/acpi_pci.c
--- a/sys/dev/acpi/acpi_pci.c   Wed Jun 09 02:48:52 2010 +0000
+++ b/sys/dev/acpi/acpi_pci.c   Wed Jun 09 04:20:10 2010 +0000
@@ -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);
 



Home | Main Index | Thread Index | Old Index