Module Name: src
Committed By: riastradh
Date: Sun Dec 19 12:24:49 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915/display: intel_bios.c
Log Message:
i915: No need for #ifdef __NetBSD__ to sprinkle legitimate const.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/drm2/dist/drm/i915/display/intel_bios.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/external/bsd/drm2/dist/drm/i915/display/intel_bios.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/display/intel_bios.c:1.3 src/sys/external/bsd/drm2/dist/drm/i915/display/intel_bios.c:1.4
--- src/sys/external/bsd/drm2/dist/drm/i915/display/intel_bios.c:1.3 Sun Dec 19 11:38:03 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/display/intel_bios.c Sun Dec 19 12:24:49 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_bios.c,v 1.3 2021/12/19 11:38:03 riastradh Exp $ */
+/* $NetBSD: intel_bios.c,v 1.4 2021/12/19 12:24:49 riastradh Exp $ */
/*
* Copyright © 2006 Intel Corporation
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_bios.c,v 1.3 2021/12/19 11:38:03 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_bios.c,v 1.4 2021/12/19 12:24:49 riastradh Exp $");
#include <drm/drm_dp_helper.h>
#include <drm/i915_drm.h>
@@ -188,16 +188,10 @@ get_lvds_dvo_timing(const struct bdb_lvd
int dvo_timing_offset =
lvds_lfp_data_ptrs->ptr[0].dvo_timing_offset -
lvds_lfp_data_ptrs->ptr[0].fp_timing_offset;
-#ifdef __NetBSD__
const char *entry = (const char *)lvds_lfp_data->data +
lfp_data_size * index;
return (const struct lvds_dvo_timing *)(entry + dvo_timing_offset);
-#else
- char *entry = (char *)lvds_lfp_data->data + lfp_data_size * index;
-
- return (struct lvds_dvo_timing *)(entry + dvo_timing_offset);
-#endif
}
/* get lvds_fp_timing entry
