summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorriastradh <riastradh@NetBSD.org>2022-02-27 14:19:07 +0000
committerriastradh <riastradh@NetBSD.org>2022-02-27 14:19:07 +0000
commit723ae677ec7e6ee60d90e786d1c044d8ce40f226 (patch)
tree5dca2cba83b35db8769f1b2df5f2fe8f04c9044a /sys/dev
parent28f99801ee487971b3bfd2491779f2f79a745615 (diff)
acpi: Nix conditional pci_get_segment use.
New MI default of 0 serves.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/acpi/acpi_mcfg.c9
-rw-r--r--sys/dev/acpi/acpi_pci.c8
2 files changed, 4 insertions, 13 deletions
diff --git a/sys/dev/acpi/acpi_mcfg.c b/sys/dev/acpi/acpi_mcfg.c
index 617cd6a8f70..4e10446f2ab 100644
--- a/sys/dev/acpi/acpi_mcfg.c
+++ b/sys/dev/acpi/acpi_mcfg.c
@@ -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>
@@ -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 pc, int bus)
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 --git a/sys/dev/acpi/acpi_pci.c b/sys/dev/acpi/acpi_pci.c
index f5c816da046..c9382549aab 100644
--- a/sys/dev/acpi/acpi_pci.c
+++ b/sys/dev/acpi/acpi_pci.c
@@ -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_t dev, devhandle_t call_handle, void *v)
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);