[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915/display i915: Omit needl...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/66ed8745906d
branches:  trunk
changeset: 362437:66ed8745906d
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Feb 27 14:20:30 2022 +0000

description:
i915: Omit needless ifdefs around ACPI API.

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/display/intel_acpi.c |  14 ++------------
 1 files changed, 2 insertions(+), 12 deletions(-)

diffs (46 lines):

diff -r 347dc8a4f9a8 -r 66ed8745906d sys/external/bsd/drm2/dist/drm/i915/display/intel_acpi.c
--- a/sys/external/bsd/drm2/dist/drm/i915/display/intel_acpi.c  Sun Feb 27 14:19:35 2022 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/display/intel_acpi.c  Sun Feb 27 14:20:30 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intel_acpi.c,v 1.5 2022/02/27 14:19:35 riastradh Exp $ */
+/*     $NetBSD: intel_acpi.c,v 1.6 2022/02/27 14:20:30 riastradh Exp $ */
 
 // SPDX-License-Identifier: GPL-2.0
 /*
@@ -8,7 +8,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_acpi.c,v 1.5 2022/02/27 14:19:35 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_acpi.c,v 1.6 2022/02/27 14:20:30 riastradh Exp $");
 
 #include <linux/pci.h>
 #include <linux/acpi.h>
@@ -181,11 +181,7 @@
 static void intel_dsm_platform_mux_info(acpi_handle dhandle)
 {
        int i;
-#ifdef __NetBSD__
-       ACPI_OBJECT *pkg, *connector_count;
-#else
        union acpi_object *pkg, *connector_count;
-#endif
 
        pkg = acpi_evaluate_dsm_typed(dhandle, &intel_dsm_guid,
                        INTEL_DSM_REVISION_ID, INTEL_DSM_FN_PLATFORM_MUX_INFO,
@@ -199,15 +195,9 @@
        DRM_DEBUG_DRIVER("MUX info connectors: %lld\n",
                  (unsigned long long)connector_count->integer.value);
        for (i = 1; i < pkg->package.count; i++) {
-#ifdef __NetBSD__
-               ACPI_OBJECT *obj = &pkg->package.elements[i];
-               ACPI_OBJECT *connector_id = &obj->package.elements[0];
-               ACPI_OBJECT *info = &obj->package.elements[1];
-#else
                union acpi_object *obj = &pkg->package.elements[i];
                union acpi_object *connector_id = &obj->package.elements[0];
                union acpi_object *info = &obj->package.elements[1];
-#endif
                DRM_DEBUG_DRIVER("Connector id: 0x%016llx\n",
                          (unsigned long long)connector_id->integer.value);
                DRM_DEBUG_DRIVER("  port id: %s\n",