[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915 Avoiding arithmetic on v...

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

details:   https://anonhg.NetBSD.org/src/rev/9f75c56a6ac0
branches:  trunk
changeset: 328906:9f75c56a6ac0
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Wed Apr 23 21:34:17 2014 +0000

description:
Avoiding arithmetic on void * need not be NetBSD-specific.

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/intel_opregion.c |  20 --------------------
 1 files changed, 0 insertions(+), 20 deletions(-)

diffs (47 lines):

diff -r 092f08e48da0 -r 9f75c56a6ac0 sys/external/bsd/drm2/dist/drm/i915/intel_opregion.c
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_opregion.c      Wed Apr 23 20:57:15 2014 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_opregion.c      Wed Apr 23 21:34:17 2014 +0000
@@ -551,43 +551,23 @@
                goto err_out;
        }
        opregion->header = base;
-#ifdef __NetBSD__
        opregion->vbt = (char *)base + OPREGION_VBT_OFFSET;
-#else
-       opregion->vbt = base + OPREGION_VBT_OFFSET;
-#endif
 
-#ifdef __NetBSD__
        opregion->lid_state = (void *)((char *)base + ACPI_CLID);
-#else
-       opregion->lid_state = base + ACPI_CLID;
-#endif
 
        mboxes = ioread32(&opregion->header->mboxes);
        if (mboxes & MBOX_ACPI) {
                DRM_DEBUG_DRIVER("Public ACPI methods supported\n");
-#ifdef __NetBSD__
                opregion->acpi = (void *)((char *)base + OPREGION_ACPI_OFFSET);
-#else
-               opregion->acpi = base + OPREGION_ACPI_OFFSET;
-#endif
        }
 
        if (mboxes & MBOX_SWSCI) {
                DRM_DEBUG_DRIVER("SWSCI supported\n");
-#ifdef __NetBSD__
                opregion->swsci = (void *)((char *)base + OPREGION_SWSCI_OFFSET);
-#else
-               opregion->swsci = base + OPREGION_SWSCI_OFFSET;
-#endif
        }
        if (mboxes & MBOX_ASLE) {
                DRM_DEBUG_DRIVER("ASLE supported\n");
-#ifdef __NetBSD__
                opregion->asle = (void *)((char *)base + OPREGION_ASLE_OFFSET);
-#else
-               opregion->asle = base + OPREGION_ASLE_OFFSET;
-#endif
        }
 
        return 0;