Module Name: src
Committed By: riastradh
Date: Sun Feb 27 14:19:08 UTC 2022
Modified Files:
src/sys/dev/acpi: acpi_mcfg.c acpi_pci.c
Log Message:
acpi: Nix conditional pci_get_segment use.
New MI default of 0 serves.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/dev/acpi/acpi_mcfg.c
cvs rdiff -u -r1.35 -r1.36 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_mcfg.c
diff -u src/sys/dev/acpi/acpi_mcfg.c:1.24 src/sys/dev/acpi/acpi_mcfg.c:1.25
--- src/sys/dev/acpi/acpi_mcfg.c:1.24 Sat Aug 7 21:19:15 2021
+++ src/sys/dev/acpi/acpi_mcfg.c Sun Feb 27 14:19:07 2022
@@ -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 <non...@netbsd.org>
@@ -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 @@ acpimcfg_get_segment(pci_chipset_tag_t p
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 &&
Index: src/sys/dev/acpi/acpi_pci.c
diff -u src/sys/dev/acpi/acpi_pci.c:1.35 src/sys/dev/acpi/acpi_pci.c:1.36
--- src/sys/dev/acpi/acpi_pci.c:1.35 Fri Feb 11 23:19:59 2022
+++ src/sys/dev/acpi/acpi_pci.c Sun Feb 27 14:19:07 2022
@@ -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 @@ acpi_pci_bus_get_child_devhandle(device_
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);
