[src/riastradh-drm2]: src/sys Omit more needless #ifdef __NetBSD__.

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

details:   https://anonhg.NetBSD.org/src/rev/d2f65e683228
branches:  riastradh-drm2
changeset: 788567:d2f65e683228
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Sep 08 16:38:02 2013 +0000

description:
Omit more needless #ifdef __NetBSD__.

diffstat:

 sys/external/bsd/drm2/dist/drm/drm_crtc.c         |  4 ----
 sys/external/bsd/drm2/dist/drm/i915/intel_panel.c |  8 --------
 sys/modules/i915drm2/Makefile                     |  3 ++-
 3 files changed, 2 insertions(+), 13 deletions(-)

diffs (58 lines):

diff -r 835d0c120fc2 -r d2f65e683228 sys/external/bsd/drm2/dist/drm/drm_crtc.c
--- a/sys/external/bsd/drm2/dist/drm/drm_crtc.c Sun Sep 08 16:35:20 2013 +0000
+++ b/sys/external/bsd/drm2/dist/drm/drm_crtc.c Sun Sep 08 16:38:02 2013 +0000
@@ -2160,12 +2160,8 @@
                   void *data, struct drm_file *file_priv)
 {
        struct drm_mode_fb_cmd *or = data;
-#ifdef __NetBSD__              /* XXX ...or just use memset.  */
        static const struct drm_mode_fb_cmd2 zero_fbcmd;
        struct drm_mode_fb_cmd2 r = zero_fbcmd;
-#else
-       struct drm_mode_fb_cmd2 r = {};
-#endif
        struct drm_mode_config *config = &dev->mode_config;
        struct drm_framebuffer *fb;
        int ret = 0;
diff -r 835d0c120fc2 -r d2f65e683228 sys/external/bsd/drm2/dist/drm/i915/intel_panel.c
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_panel.c Sun Sep 08 16:35:20 2013 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_panel.c Sun Sep 08 16:38:02 2013 +0000
@@ -166,10 +166,6 @@
        return val;
 }
 
-#ifdef __NetBSD__              /* XXX max kludge */
-#  define      max     max_hack
-#endif
-
 static u32 _intel_panel_get_max_backlight(struct drm_device *dev)
 {
        u32 max;
@@ -288,10 +284,6 @@
        I915_WRITE(BLC_PWM_CTL, tmp | level);
 }
 
-#ifdef __NetBSD__              /* XXX max hack */
-#  undef       max
-#endif
-
 void intel_panel_set_backlight(struct drm_device *dev, u32 level)
 {
        struct drm_i915_private *dev_priv = dev->dev_private;
diff -r 835d0c120fc2 -r d2f65e683228 sys/modules/i915drm2/Makefile
--- a/sys/modules/i915drm2/Makefile     Sun Sep 08 16:35:20 2013 +0000
+++ b/sys/modules/i915drm2/Makefile     Sun Sep 08 16:38:02 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.2.10 2013/09/08 15:59:47 riastradh Exp $
+# $NetBSD: Makefile,v 1.1.2.11 2013/09/08 16:38:02 riastradh Exp $
 
 .include "../Makefile.inc"
 .include "../drm2/Makefile.inc"
@@ -57,6 +57,7 @@
 SRCS+= i915_pci.c
 SRCS+= intel_gtt.c
 
+COPTS.intel_panel.c+=  -Wno-shadow
 COPTS.intel_pm.c+=     -Wno-shadow
 
 .include <bsd.kmodule.mk>