 @@ -1,14 +1,14 @@
-/*	$NetBSD: nand.c,v 1.9 2011/04/26 13:38:13 ahoka Exp $	*/
+/*	$NetBSD: nand.c,v 1.10 2011/04/26 17:31:57 ahoka Exp $	*/
 /*-
  * Copyright (c) 2010 Department of Software Engineering,
  *		      University of Szeged, Hungary
  * Copyright (c) 2010 Adam Hoka <ahoka@NetBSD.org>
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by the Department of Software Engineering, University of Szeged, Hungary
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -24,67 +24,62 @@
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
  * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
  * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 /* Common driver for NAND chips implementing the ONFI 2.2 specification */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nand.c,v 1.9 2011/04/26 13:38:13 ahoka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nand.c,v 1.10 2011/04/26 17:31:57 ahoka Exp $");
 #include "locators.h"
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/device.h>
 #include <sys/kmem.h>
 #include <sys/sysctl.h>
 #include <sys/atomic.h>
 #include <dev/flash/flash.h>
 #include <dev/nand/nand.h>
 #include <dev/nand/onfi.h>
 #include <dev/nand/hamming.h>
 #include <dev/nand/nand_bbt.h>
 #include <dev/nand/nand_crc.h>
 #include "opt_nand.h"
 int nand_match(device_t, cfdata_t, void *);
 void nand_attach(device_t, device_t, void *);
 int nand_detach(device_t, int);
 bool nand_shutdown(device_t, int);
 void nand_childdet(device_t, device_t);
 int nand_print(void *, const char *);
 static int nand_search(device_t, cfdata_t, const int *, void *);
 static void nand_address_row(device_t, size_t);
 static void nand_address_column(device_t, size_t, size_t);
 static int nand_fill_chip_structure(device_t, struct nand_chip *);
 static int nand_scan_media(device_t, struct nand_chip *);
 static bool nand_check_wp(device_t);
-CFATTACH_DECL2_NEW(nand, sizeof(struct nand_softc),
+CFATTACH_DECL_NEW(nand, sizeof(struct nand_softc),
-    nand_match, nand_attach, nand_detach,
+    nand_match, nand_attach, nand_detach, NULL);
     NULL, NULL, nand_childdet);
 //CFATTACH_DECL_NEW(nand, sizeof(struct nand_softc),
 //    nand_match, nand_attach, nand_detach, NULL);
 #ifdef NAND_DEBUG
 int	nanddebug = NAND_DEBUG;
 #endif
 int nand_cachesync_timeout = 1;
 int nand_cachesync_nodenum;
 #ifdef NAND_VERBOSE
 const struct nand_manufacturer nand_mfrs[] = {
 	{ NAND_MFR_AMD,		"AMD" },
 	{ NAND_MFR_FUJITSU,	"Fujitsu" },
 	{ NAND_MFR_RENESAS,	"Renesas" },
 @@ -122,28 +117,26 @@ nand_match(device_t parent, cfdata_t mat
+}
 void
 nand_attach(device_t parent, device_t self, void *aux)
+{
 	struct nand_softc *sc = device_private(self);
 	struct nand_attach_args *naa = aux;
 	struct nand_chip *chip = &sc->sc_chip;
 	sc->sc_dev = self;
 	sc->controller_dev = parent;
 	sc->nand_if = naa->naa_nand_if;
 	sc->sc_children = 0;
 	aprint_naive("\n");
 	if (nand_check_wp(self)) {
 		aprint_error("NAND chip is write protected!\n");
 		return;
+	}
 	if (nand_scan_media(self, chip)) {
 		return;
+	}
 	/* allocate cache */
 	chip->nc_oob_cache = kmem_alloc(chip->nc_spare_size, KM_SLEEP);
 @@ -210,72 +203,63 @@ nand_search(device_t parent, cfdata_t cf
 		flash_if->size = cf->cf_loc[FLASHBUSCF_SIZE];
 		flash_if->partition.part_size = cf->cf_loc[FLASHBUSCF_SIZE];
+	}
 	if (cf->cf_loc[FLASHBUSCF_READONLY])
 		flash_if->partition.part_flags = FLASH_PART_READONLY;
 	else
 		flash_if->partition.part_flags = 0;
 	faa.flash_if = flash_if;
 	if (config_match(parent, cf, &faa)) {
 		if (config_attach(parent, cf, &faa, nand_print) != NULL) {
 			atomic_inc_uint(&sc->sc_children);
 			return 0;
 		} else {
 			return 1;
+		}
 	} else {
 		kmem_free(flash_if, sizeof(*flash_if));
+	}
 	return 1;
+}
 int
 nand_detach(device_t self, int flags)
+{
 	struct nand_softc *sc = device_private(self);
 	struct nand_chip *chip = &sc->sc_chip;
-	int ret = 0;
+	int error = 0;
-	if (sc->sc_children != 0) {
+	error = config_detach_children(self, flags);
-		return EBUSY;
+	if (error) {
 		return error;
+	}
 	nand_sync_thread_stop(self);
 #ifdef NAND_BBT
 	nand_bbt_detach(self);
 #endif
 	/* free oob cache */
 	kmem_free(chip->nc_oob_cache, chip->nc_spare_size);
 	kmem_free(chip->nc_page_cache, chip->nc_page_size);
 	kmem_free(chip->nc_ecc_cache, chip->nc_ecc->necc_size);
 	mutex_destroy(&sc->sc_device_lock);
 	pmf_device_deregister(sc->sc_dev);
-	return ret;
+	return error;
 void
 nand_childdet(device_t self, device_t child)
 	struct nand_softc *sc = device_private(self);
 	atomic_dec_uint(&sc->sc_children);
 	KASSERT(sc->sc_children >= 0);
+}
 int
 nand_print(void *aux, const char *pnp)
+{
 	if (pnp != NULL)
 		aprint_normal("nand at %s\n", pnp);
 	return UNCONF;
+}
 /* ask for a nand driver to attach to the controller */
 device_t

 @@ -1,14 +1,14 @@
-/*	$NetBSD: nand.h,v 1.7 2011/04/26 13:38:13 ahoka Exp $	*/
+/*	$NetBSD: nand.h,v 1.8 2011/04/26 17:31:57 ahoka Exp $	*/
 /*-
  * Copyright (c) 2010 Department of Software Engineering,
  *		      University of Szeged, Hungary
  * Copyright (c) 2010 Adam Hoka <ahoka@NetBSD.org>
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by the Department of Software Engineering, University of Szeged, Hungary
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -151,33 +151,26 @@ struct nand_softc {
 	void *nand_softc;
 	struct nand_chip sc_chip;
 	struct nand_bbt sc_bbt;
 	size_t sc_part_offset;
 	size_t sc_part_size;
 	kmutex_t sc_device_lock; /* serialize access to chip */
 	/* for the i/o thread */
 	struct lwp *sc_sync_thread;
 	struct nand_write_cache sc_cache;
 	kmutex_t sc_io_lock;
 	kcondvar_t sc_io_cv;
 	bool sc_io_running;
 	/* currently we cant automatically detach children
 	 * so keep count of attached children so we will
 	 * know, that when is safe to detach...
 	 * XXX is it a problem only as a module? (ioconf bug?)
 	 */
 	unsigned int sc_children;
 };
 /* structure holding the nand api */
 struct nand_interface
+{
 	/* basic nand controller commands */
 	void (*select) (device_t, bool); /* optional */
 	void (*command) (device_t, uint8_t);
 	void (*address) (device_t, uint8_t);
 	void (*read_buf_byte) (device_t, void *, size_t);
 	void (*read_buf_word) (device_t, void *, size_t);
 	void (*read_byte) (device_t, uint8_t *);
 	void (*read_word) (device_t, uint16_t *);