Module Name: src
Committed By: christos
Date: Mon Oct 21 15:13:09 UTC 2013
Modified Files:
src/sys/dev/nand: nand_bbt.c
Log Message:
remove DIAGNOSTIC ifdef in preparation of a KASSERT that consumes its
arguments
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/nand/nand_bbt.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/dev/nand/nand_bbt.c
diff -u src/sys/dev/nand/nand_bbt.c:1.4 src/sys/dev/nand/nand_bbt.c:1.5
--- src/sys/dev/nand/nand_bbt.c:1.4 Sun May 1 09:20:28 2011
+++ src/sys/dev/nand/nand_bbt.c Mon Oct 21 11:13:09 2013
@@ -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;
