Module Name: src
Committed By: riastradh
Date: Wed May 10 00:11:16 UTC 2023
Modified Files:
src/sys/dev/nand: nandemulator.c
Log Message:
nandemulator(4): Use config_detach_children.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/nand/nandemulator.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/nandemulator.c
diff -u src/sys/dev/nand/nandemulator.c:1.9 src/sys/dev/nand/nandemulator.c:1.10
--- src/sys/dev/nand/nandemulator.c:1.9 Tue Oct 1 18:00:08 2019
+++ src/sys/dev/nand/nandemulator.c Wed May 10 00:11:16 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: nandemulator.c,v 1.9 2019/10/01 18:00:08 chs Exp $ */
+/* $NetBSD: nandemulator.c,v 1.10 2023/05/10 00:11:16 riastradh Exp $ */
/*-
* Copyright (c) 2011 Department of Software Engineering,
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nandemulator.c,v 1.9 2019/10/01 18:00:08 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nandemulator.c,v 1.10 2023/05/10 00:11:16 riastradh Exp $");
/* XXX this code likely needs work */
@@ -281,20 +281,19 @@ static int
nandemulator_detach(device_t self, int flags)
{
struct nandemulator_softc *sc = device_private(self);
- int ret = 0;
+ int error;
aprint_normal_dev(sc->sc_dev, "detaching emulator\n");
- pmf_device_deregister(sc->sc_dev);
-
- if (sc->sc_nanddev != NULL)
- ret = config_detach(sc->sc_nanddev, flags);
+ error = config_detach_children(self, flags);
+ if (error)
+ return error;
+ pmf_device_deregister(sc->sc_dev);
kmem_free(sc->sc_backend, sc->sc_backend_size);
kmem_free(sc->sc_parameter_page,
sizeof(struct onfi_parameter_page) * 4);
-
- return ret;
+ return 0;
}
/**
