Source-Changes-HG archive

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

[src/trunk]: src/sys/dev/acpi acpi: Nix conditional pci_get_segment use.



details:   https://anonhg.NetBSD.org/src/rev/0b5384bec309
branches:  trunk
changeset: 362434:0b5384bec309
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Feb 27 14:19:07 2022 +0000

description:
acpi: Nix conditional pci_get_segment use.

New MI default of 0 serves.

diffstat:

 sys/dev/acpi/acpi_mcfg.c |  9 ++-------
 sys/dev/acpi/acpi_pci.c  |  8 ++------
 2 files changed, 4 insertions(+), 13 deletions(-)

diffs (61 lines):

diff -r 6a4f648acc60 -r 0b5384bec309 sys/dev/acpi/acpi_mcfg.c
--- a/sys/dev/acpi/acpi_mcfg.c  Sun Feb 27 14:18:52 2022 +0000
+++ b/sys/dev/acpi/acpi_mcfg.c  Sun Feb 27 14:19:07 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: acpi_mcfg.c,v 1.24 2021/08/07 21:19:15 jmcneill Exp $  */
+/*     $NetBSD: acpi_mcfg.c,v 1.25 2022/02/27 14:19:07 riastradh Exp $ */
 
 /*-
  * Copyright (C) 2015 NONAKA Kimihiro <nonaka%NetBSD.org@localhost>
@@ -28,7 +28,7 @@
 #include "opt_pci.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_mcfg.c,v 1.24 2021/08/07 21:19:15 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_mcfg.c,v 1.25 2022/02/27 14:19:07 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -446,12 +446,7 @@
        u_int segment;
        int i;
 
-#ifdef __HAVE_PCI_GET_SEGMENT
        segment = pci_get_segment(pc);
-#else
-       segment = 0;
-#endif
-
        for (i = 0; i < mcfg_nsegs; i++) {
                seg = &mcfg_segs[i];
                if (segment == seg->ms_segment &&
diff -r 6a4f648acc60 -r 0b5384bec309 sys/dev/acpi/acpi_pci.c
--- a/sys/dev/acpi/acpi_pci.c   Sun Feb 27 14:18:52 2022 +0000
+++ b/sys/dev/acpi/acpi_pci.c   Sun Feb 27 14:19:07 2022 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_pci.c,v 1.35 2022/02/11 23:19:59 riastradh Exp $ */
+/* $NetBSD: acpi_pci.c,v 1.36 2022/02/27 14:19:07 riastradh 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.35 2022/02/11 23:19:59 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_pci.c,v 1.36 2022/02/27 14:19:07 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -557,11 +557,7 @@
        int b, d, f;
        u_int segment;
 
-#ifdef __HAVE_PCI_GET_SEGMENT
        segment = pci_get_segment(args->pc);
-#else
-       segment = 0;
-#endif /* __HAVE_PCI_GET_SEGMENT */
 
        pci_decompose_tag(args->pc, args->tag, &b, &d, &f);
 



Home | Main Index | Thread Index | Old Index