summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorchristos <christos@NetBSD.org>2013-10-21 15:13:09 +0000
committerchristos <christos@NetBSD.org>2013-10-21 15:13:09 +0000
commit704654b5cd77bf2be0ce9ddddeb0ad67389eac4a (patch)
tree3618abcc90291c318462adca3d2455a400524ed5 /sys/dev
parent8bc3e32adec46bb87024cc6e3860ad26305d98db (diff)
remove DIAGNOSTIC ifdef in preparation of a KASSERT that consumes its
arguments
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/nand/nand_bbt.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/sys/dev/nand/nand_bbt.c b/sys/dev/nand/nand_bbt.c
index b5f52d8d517..f02e94f8e91 100644
--- a/sys/dev/nand/nand_bbt.c
+++ b/sys/dev/nand/nand_bbt.c
@@ -1,4 +1,4 @@
-/* $NetBSD: nand_bbt.c,v 1.4 2011/05/01 13:20:28 rmind Exp $ */
+/* $NetBSD: nand_bbt.c,v 1.5 2013/10/21 15:13:09 christos Exp $ */
/*-
* Copyright (c) 2011 Department of Software Engineering,
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nand_bbt.c,v 1.4 2011/05/01 13:20:28 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nand_bbt.c,v 1.5 2013/10/21 15:13:09 christos Exp $");
#include <sys/param.h>
#include <sys/kmem.h>
@@ -201,9 +201,7 @@ void
nand_bbt_block_mark(device_t self, flash_off_t block, uint8_t marker)
{
struct nand_softc *sc = device_private(self);
-#ifdef DIAGNOSTIC
struct nand_chip *chip = &sc->sc_chip;
-#endif
struct nand_bbt *bbt = &sc->sc_bbt;
uint8_t clean;
@@ -221,9 +219,7 @@ bool
nand_bbt_block_isbad(device_t self, flash_off_t block)
{
struct nand_softc *sc = device_private(self);
-#ifdef DIAGNOSTIC
struct nand_chip *chip = &sc->sc_chip;
-#endif
struct nand_bbt *bbt = &sc->sc_bbt;
uint8_t byte, marker;
bool result;