[src/trunk]: src/sys/dev/nor Make it compile without DEBUG option.

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

details:   https://anonhg.NetBSD.org/src/rev/3aa0e2e5efb8
branches:  trunk
changeset: 771502:3aa0e2e5efb8
user:      phx <phx%NetBSD.org@localhost>
date:      Wed Nov 23 21:02:28 2011 +0000

description:
Make it compile without DEBUG option.

diffstat:

 sys/dev/nor/cfi_0002.c |  12 ++----------
 1 files changed, 2 insertions(+), 10 deletions(-)

diffs (40 lines):

diff -r e24ecc214f1e -r 3aa0e2e5efb8 sys/dev/nor/cfi_0002.c
--- a/sys/dev/nor/cfi_0002.c    Wed Nov 23 19:42:10 2011 +0000
+++ b/sys/dev/nor/cfi_0002.c    Wed Nov 23 21:02:28 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cfi_0002.c,v 1.4 2011/07/23 06:26:26 cliff Exp $       */
+/*     $NetBSD: cfi_0002.c,v 1.5 2011/11/23 21:02:28 phx Exp $ */
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -31,7 +31,7 @@
 #include "opt_flash.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cfi_0002.c,v 1.4 2011/07/23 06:26:26 cliff Exp $"); 
+__KERNEL_RCSID(0, "$NetBSD: cfi_0002.c,v 1.5 2011/11/23 21:02:28 phx Exp $"); 
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -335,8 +335,6 @@
        KASSERT(sc->sc_nor_if != NULL);
        struct cfi *cfi = (struct cfi * const)sc->sc_nor_if->private;
        KASSERT(cfi != NULL);
-       struct nor_chip * const chip = &sc->sc_chip;
-       KASSERT(chip != NULL);
 
        CFI_0002_STATS_INC(cfi, erase_all);
 
@@ -364,12 +362,6 @@
        KASSERT(sc->sc_nor_if != NULL);
        struct cfi *cfi = (struct cfi * const)sc->sc_nor_if->private;
        KASSERT(cfi != NULL);
-       struct nor_chip * const chip = &sc->sc_chip;
-       KASSERT(chip != NULL);
-       KASSERT(chip->nc_block_mask != 0);
-       KASSERT((offset & ~chip->nc_block_mask) == 0);
-       KASSERT(chip->nc_block_size != 0);
-       KASSERT((chip->nc_block_size & ((1 << cfi->cfi_portwidth) - 1)) == 0);
 
        CFI_0002_STATS_INC(cfi, erase_block);