[src/trunk]: src/sys/dev don't behave differently when DIAGNOSTIC is defined

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

details:   https://anonhg.NetBSD.org/src/rev/e2aabd69bd18
branches:  trunk
changeset: 772743:e2aabd69bd18
user:      plunky <plunky%NetBSD.org@localhost>
date:      Sat Jan 14 21:37:17 2012 +0000

description:
don't behave differently when DIAGNOSTIC is defined

diffstat:

 sys/dev/pcmcia/bt3c.c |  6 ++----
 sys/dev/usb/ubt.c     |  6 ++----
 2 files changed, 4 insertions(+), 8 deletions(-)

diffs (66 lines):

diff -r 532b0ab7eb06 -r e2aabd69bd18 sys/dev/pcmcia/bt3c.c
--- a/sys/dev/pcmcia/bt3c.c     Sat Jan 14 21:24:52 2012 +0000
+++ b/sys/dev/pcmcia/bt3c.c     Sat Jan 14 21:37:17 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bt3c.c,v 1.21 2010/02/24 22:38:08 dyoung Exp $ */
+/* $NetBSD: bt3c.c,v 1.22 2012/01/14 21:38:00 plunky Exp $ */
 
 /*-
  * Copyright (c) 2005 Iain D. Hibbert,
@@ -69,7 +69,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bt3c.c,v 1.21 2010/02/24 22:38:08 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bt3c.c,v 1.22 2012/01/14 21:38:00 plunky Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -596,13 +596,11 @@
        }
 
        size = (size_t)firmware_get_size(fh);
-#ifdef DIAGNOSTIC
        if (size > 10 * 1024) { /* sanity check */
                aprint_error_dev(sc->sc_dev, "insane firmware file size!\n");
                firmware_close(fh);
                return EFBIG;
        }
-#endif
 
        buf = firmware_malloc(size);
        KASSERT(buf != NULL);
diff -r 532b0ab7eb06 -r e2aabd69bd18 sys/dev/usb/ubt.c
--- a/sys/dev/usb/ubt.c Sat Jan 14 21:24:52 2012 +0000
+++ b/sys/dev/usb/ubt.c Sat Jan 14 21:37:17 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ubt.c,v 1.42 2011/12/23 00:51:45 jakllsch Exp $        */
+/*     $NetBSD: ubt.c,v 1.43 2012/01/14 21:37:17 plunky Exp $  */
 
 /*-
  * Copyright (c) 2006 Itronix Inc.
@@ -67,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ubt.c,v 1.42 2011/12/23 00:51:45 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ubt.c,v 1.43 2012/01/14 21:37:17 plunky Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -680,7 +680,6 @@
                return ENOENT;
        }
 
-#ifdef DIAGNOSTIC
        if (rd_size > MLEN) {
                aprint_error_dev(sc->sc_dev, "rd_size=%d exceeds MLEN\n",
                    rd_size);
@@ -694,7 +693,6 @@
 
                return EOVERFLOW;
        }
-#endif
 
        sc->sc_scord_size = rd_size;
        sc->sc_scord_addr = rd_addr;