Module Name: src
Committed By: riastradh
Date: Wed May 10 00:12:05 UTC 2023
Modified Files:
src/sys/dev/pcmcia: mhzc.c
Log Message:
mhzc(4): Use config_detach_children.
To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/sys/dev/pcmcia/mhzc.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/pcmcia/mhzc.c
diff -u src/sys/dev/pcmcia/mhzc.c:1.55 src/sys/dev/pcmcia/mhzc.c:1.56
--- src/sys/dev/pcmcia/mhzc.c:1.55 Fri Jan 20 01:35:03 2023
+++ src/sys/dev/pcmcia/mhzc.c Wed May 10 00:12:05 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: mhzc.c,v 1.55 2023/01/20 01:35:03 msaitoh Exp $ */
+/* $NetBSD: mhzc.c,v 1.56 2023/05/10 00:12:05 riastradh Exp $ */
/*-
* Copyright (c) 1999, 2000, 2004 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mhzc.c,v 1.55 2023/01/20 01:35:03 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mhzc.c,v 1.56 2023/05/10 00:12:05 riastradh Exp $");
#include "opt_inet.h"
@@ -334,17 +334,11 @@ int
mhzc_detach(device_t self, int flags)
{
struct mhzc_softc *sc = device_private(self);
- int rv;
-
- if (sc->sc_ethernet != NULL) {
- if ((rv = config_detach(sc->sc_ethernet, flags)) != 0)
- return rv;
- }
+ int error;
- if (sc->sc_modem != NULL) {
- if ((rv = config_detach(sc->sc_modem, flags)) != 0)
- return rv;
- }
+ error = config_detach_children(self, flags);
+ if (error)
+ return error;
/* Unmap our i/o windows. */
if (sc->sc_flags & MHZC_MODEM_MAPPED)
