Module Name: src
Committed By: riastradh
Date: Wed May 10 00:09:31 UTC 2023
Modified Files:
src/sys/dev/gpio: gpioow.c
Log Message:
gpioow(4): Use config_detach_children.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/gpio/gpioow.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/gpio/gpioow.c
diff -u src/sys/dev/gpio/gpioow.c:1.19 src/sys/dev/gpio/gpioow.c:1.20
--- src/sys/dev/gpio/gpioow.c:1.19 Sat Aug 7 16:19:10 2021
+++ src/sys/dev/gpio/gpioow.c Wed May 10 00:09:31 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: gpioow.c,v 1.19 2021/08/07 16:19:10 thorpej Exp $ */
+/* $NetBSD: gpioow.c,v 1.20 2023/05/10 00:09:31 riastradh Exp $ */
/* $OpenBSD: gpioow.c,v 1.1 2006/03/04 16:27:03 grange Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gpioow.c,v 1.19 2021/08/07 16:19:10 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gpioow.c,v 1.20 2023/05/10 00:09:31 riastradh Exp $");
/*
* 1-Wire bus bit-banging through GPIO pin.
@@ -162,16 +162,15 @@ static int
gpioow_detach(device_t self, int flags)
{
struct gpioow_softc *sc = device_private(self);
- int rv = 0;
-
- if (sc->sc_ow_dev != NULL)
- rv = config_detach(sc->sc_ow_dev, flags);
+ int error;
- if (!rv) {
- gpio_pin_unmap(sc->sc_gpio, &sc->sc_map);
- pmf_device_deregister(self);
- }
- return rv;
+ error = config_detach_children(self, flags);
+ if (error)
+ return error;
+
+ gpio_pin_unmap(sc->sc_gpio, &sc->sc_map);
+ pmf_device_deregister(self);
+ return 0;
}
static int
