CVS commit: src/sys/arch/powerpc/booke/dev

[Taylor R Campbell]

Module Name:    src
Committed By:   riastradh
Date:           Wed May 10 00:08:07 UTC 2023

Modified Files:
        src/sys/arch/powerpc/booke/dev: pq3cfi.c pq3nandfcm.c

Log Message:
powerpc: Use config_detach_children to reduce error branch bugs.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/powerpc/booke/dev/pq3cfi.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/powerpc/booke/dev/pq3nandfcm.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/arch/powerpc/booke/dev/pq3cfi.c
diff -u src/sys/arch/powerpc/booke/dev/pq3cfi.c:1.7 src/sys/arch/powerpc/booke/dev/pq3cfi.c:1.8
--- src/sys/arch/powerpc/booke/dev/pq3cfi.c:1.7	Mon Jul  6 10:22:44 2020
+++ src/sys/arch/powerpc/booke/dev/pq3cfi.c	Wed May 10 00:08:07 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: pq3cfi.c,v 1.7 2020/07/06 10:22:44 rin Exp $	*/
+/*	$NetBSD: pq3cfi.c,v 1.8 2023/05/10 00:08:07 riastradh Exp $	*/
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pq3cfi.c,v 1.7 2020/07/06 10:22:44 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pq3cfi.c,v 1.8 2023/05/10 00:08:07 riastradh Exp $");
 
 #include "locators.h"
 
@@ -164,14 +164,15 @@ static int
 pq3cfi_detach(device_t self, int flags)
 {
 	struct pq3cfi_softc *sc = device_private(self);
-	int rv = 0;
+	int error;
 
-	pmf_device_deregister(self);
+	error = config_detach_children(self, flags);
+	if (error)
+		return error;
 
-	if (sc->sc_nordev != NULL)
-		rv = config_detach(sc->sc_nordev, flags);
+	pmf_device_deregister(self);
 
 	bus_space_unmap(sc->sc_cfi.cfi_bst, sc->sc_cfi.cfi_bsh, sc->sc_size);
 
-	return rv;
+	return 0;
 }

Index: src/sys/arch/powerpc/booke/dev/pq3nandfcm.c
diff -u src/sys/arch/powerpc/booke/dev/pq3nandfcm.c:1.4 src/sys/arch/powerpc/booke/dev/pq3nandfcm.c:1.5
--- src/sys/arch/powerpc/booke/dev/pq3nandfcm.c:1.4	Mon Jul  6 10:22:44 2020
+++ src/sys/arch/powerpc/booke/dev/pq3nandfcm.c	Wed May 10 00:08:07 2023
@@ -30,7 +30,7 @@
 #define LBC_PRIVATE
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pq3nandfcm.c,v 1.4 2020/07/06 10:22:44 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pq3nandfcm.c,v 1.5 2023/05/10 00:08:07 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -111,16 +111,17 @@ int
 pq3nandfcm_detach(device_t self, int flags)
 {
 	struct pq3nandfcm_softc * const sc = device_private(self);
-	int rv = 0;
+	int error;
 
-	pmf_device_deregister(self);
+	error = config_detach_children(self, flags);
+	if (error)
+		return error;
 
-	if (sc->sc_nanddev != NULL)
-		rv = config_detach(sc->sc_nanddev, flags);
+	pmf_device_deregister(self);
 
 	bus_space_unmap(sc->sc_window_bst, sc->sc_window_bsh,
 	    sc->sc_window_size);
-	return rv;
+	return 0;
 }
 void
 pq3nandfcm_command(device_t self, uint8_t command)