10 files changed, 61 insertions, 10 deletions

diff --git a/sys/arm/nvidia/as3722.c b/sys/arm/nvidia/as3722.c
index 537cd4f6e24a..1feb6d400aa8 100644
--- a/sys/arm/nvidia/as3722.c
+++ b/sys/arm/nvidia/as3722.c
@@ -343,6 +343,11 @@ static int
 as3722_detach(device_t dev)
 {
 	struct as3722_softc *sc;
+	int error;
+
+	error = bus_generic_detach(dev);
+	if (error != 0)
+		return (error);
 
 	sc = device_get_softc(dev);
 	if (sc->irq_h != NULL)
@@ -351,7 +356,7 @@ as3722_detach(device_t dev)
 		bus_release_resource(dev, SYS_RES_IRQ, 0, sc->irq_res);
 	LOCK_DESTROY(sc);
 
-	return (bus_generic_detach(dev));
+	return (0);
 }
 
 static phandle_t
diff --git a/sys/arm/nvidia/drm2/tegra_dc.c b/sys/arm/nvidia/drm2/tegra_dc.c
index f086570e3f09..f79cb76aa10d 100644
--- a/sys/arm/nvidia/drm2/tegra_dc.c
+++ b/sys/arm/nvidia/drm2/tegra_dc.c
@@ -1394,6 +1394,11 @@ static int
 dc_detach(device_t dev)
 {
 	struct dc_softc *sc;
+	int error;
+
+	error = bus_generic_detach(dev);
+	if (error != 0)
+		return (error);
 
 	sc = device_get_softc(dev);
 
@@ -1413,7 +1418,7 @@ dc_detach(device_t dev)
 		bus_release_resource(dev, SYS_RES_MEMORY, 0, sc->mem_res);
 	LOCK_DESTROY(sc);
 
-	return (bus_generic_detach(dev));
+	return (0);
 }
 
 static device_method_t tegra_dc_methods[] = {
diff --git a/sys/arm/nvidia/drm2/tegra_hdmi.c b/sys/arm/nvidia/drm2/tegra_hdmi.c
index 641787a40e71..16454601ec13 100644
--- a/sys/arm/nvidia/drm2/tegra_hdmi.c
+++ b/sys/arm/nvidia/drm2/tegra_hdmi.c
@@ -1273,6 +1273,12 @@ static int
 hdmi_detach(device_t dev)
 {
 	struct hdmi_softc *sc;
+	int error;
+
+	error = bus_generic_detach(dev);
+	if (error != 0)
+		return (error);
+
 	sc = device_get_softc(dev);
 
 	TEGRA_DRM_DEREGISTER_CLIENT(device_get_parent(sc->dev), sc->dev);
@@ -1295,7 +1301,7 @@ hdmi_detach(device_t dev)
 		bus_release_resource(dev, SYS_RES_IRQ, 0, sc->irq_res);
 	if (sc->mem_res != NULL)
 		bus_release_resource(dev, SYS_RES_MEMORY, 0, sc->mem_res);
-	return (bus_generic_detach(dev));
+	return (0);
 }
 
 static device_method_t tegra_hdmi_methods[] = {
diff --git a/sys/arm/nvidia/drm2/tegra_host1x.c b/sys/arm/nvidia/drm2/tegra_host1x.c
index 7d5044d5403b..84f6229e76ca 100644
--- a/sys/arm/nvidia/drm2/tegra_host1x.c
+++ b/sys/arm/nvidia/drm2/tegra_host1x.c
@@ -587,6 +587,11 @@ static int
 host1x_detach(device_t dev)
 {
 	struct host1x_softc *sc;
+	int error;
+
+	error = bus_generic_detach(dev);
+	if (error != 0)
+		return (error);
 
 	sc = device_get_softc(dev);
 
@@ -609,7 +614,7 @@ host1x_detach(device_t dev)
 	if (sc->mem_res != NULL)
 		bus_release_resource(dev, SYS_RES_MEMORY, 0, sc->mem_res);
 	LOCK_DESTROY(sc);
-	return (bus_generic_detach(dev));
+	return (0);
 }
 
 static device_method_t host1x_methods[] = {
diff --git a/sys/arm/nvidia/tegra_abpmisc.c b/sys/arm/nvidia/tegra_abpmisc.c
index 88f9ecde3f31..1f54a918f63b 100644
--- a/sys/arm/nvidia/tegra_abpmisc.c
+++ b/sys/arm/nvidia/tegra_abpmisc.c
@@ -166,13 +166,18 @@ static int
 tegra_abpmisc_detach(device_t dev)
 {
 	struct tegra_abpmisc_softc *sc;
+	int error;
+
+	error = bus_generic_detach(dev);
+	if (error != 0)
+		return (error);
 
 	sc = device_get_softc(dev);
 	if (sc->abp_misc_res != NULL)
 		bus_release_resource(dev, SYS_RES_MEMORY, 0, sc->abp_misc_res);
 	if (sc->strap_opt_res != NULL)
 		bus_release_resource(dev, SYS_RES_MEMORY, 1, sc->strap_opt_res);
-	return (bus_generic_detach(dev));
+	return (0);
 }
 
 static device_method_t tegra_abpmisc_methods[] = {
diff --git a/sys/arm/nvidia/tegra_efuse.c b/sys/arm/nvidia/tegra_efuse.c
index 7c88bcb3fe03..a7af16504ab3 100644
--- a/sys/arm/nvidia/tegra_efuse.c
+++ b/sys/arm/nvidia/tegra_efuse.c
@@ -500,6 +500,11 @@ static int
 tegra_efuse_detach(device_t dev)
 {
 	struct tegra_efuse_softc *sc;
+	int error;
+
+	error = bus_generic_detach(dev);
+	if (error != 0)
+		return (error);
 
 	sc = device_get_softc(dev);
 	dev_sc = NULL;
@@ -510,7 +515,7 @@ tegra_efuse_detach(device_t dev)
 	if (sc->mem_res != NULL)
 		bus_release_resource(dev, SYS_RES_MEMORY, 0, sc->mem_res);
 
-	return (bus_generic_detach(dev));
+	return (0);
 }
 
 static device_method_t tegra_efuse_methods[] = {
diff --git a/sys/arm/nvidia/tegra_i2c.c b/sys/arm/nvidia/tegra_i2c.c
index 6b68b859a037..94e130ec3623 100644
--- a/sys/arm/nvidia/tegra_i2c.c
+++ b/sys/arm/nvidia/tegra_i2c.c
@@ -740,6 +740,11 @@ static int
 tegra_i2c_detach(device_t dev)
 {
 	struct tegra_i2c_softc *sc;
+	int error;
+
+	error = bus_generic_detach(dev);
+	if (error != 0)
+		return (error);
 
 	sc = device_get_softc(dev);
 	tegra_i2c_hw_init(sc);
@@ -753,7 +758,7 @@ tegra_i2c_detach(device_t dev)
 	LOCK_DESTROY(sc);
 	if (sc->iicbus)
 		device_delete_child(dev, sc->iicbus);
-	return (bus_generic_detach(dev));
+	return (0);
 }
 
 static phandle_t
diff --git a/sys/arm/nvidia/tegra_mc.c b/sys/arm/nvidia/tegra_mc.c
index bad75f274af0..4c567657a96b 100644
--- a/sys/arm/nvidia/tegra_mc.c
+++ b/sys/arm/nvidia/tegra_mc.c
@@ -280,6 +280,11 @@ static int
 tegra_mc_detach(device_t dev)
 {
 	struct tegra_mc_softc *sc;
+	int error;
+
+	error = bus_generic_detach(dev);
+	if (error != 0)
+		return (error);
 
 	sc = device_get_softc(dev);
 	if (sc->irq_h != NULL)
@@ -290,7 +295,7 @@ tegra_mc_detach(device_t dev)
 		bus_release_resource(dev, SYS_RES_MEMORY, 0, sc->mem_res);
 
 	LOCK_DESTROY(sc);
-	return (bus_generic_detach(dev));
+	return (0);
 }
 
 static device_method_t tegra_mc_methods[] = {
diff --git a/sys/arm/nvidia/tegra_rtc.c b/sys/arm/nvidia/tegra_rtc.c
index b489967c946e..d2cc4d29f202 100644
--- a/sys/arm/nvidia/tegra_rtc.c
+++ b/sys/arm/nvidia/tegra_rtc.c
@@ -266,6 +266,11 @@ static int
 tegra_rtc_detach(device_t dev)
 {
 	struct tegra_rtc_softc *sc;
+	int error;
+
+	error = bus_generic_detach(dev);
+	if (error != 0)
+		return (error);
 
 	sc = device_get_softc(dev);
 	if (sc->irq_h != NULL)
@@ -276,7 +281,7 @@ tegra_rtc_detach(device_t dev)
 		bus_release_resource(dev, SYS_RES_MEMORY, 0, sc->mem_res);
 
 	LOCK_DESTROY(sc);
-	return (bus_generic_detach(dev));
+	return (0);
 }
 
 static device_method_t tegra_rtc_methods[] = {
diff --git a/sys/arm/ti/ti_adc.c b/sys/arm/ti/ti_adc.c
index 5a3a337afff5..d13dd87001de 100644
--- a/sys/arm/ti/ti_adc.c
+++ b/sys/arm/ti/ti_adc.c
@@ -915,6 +915,11 @@ static int
 ti_adc_detach(device_t dev)
 {
 	struct ti_adc_softc *sc;
+	int error;
+
+	error = bus_generic_detach(dev);
+	if (error != 0)
+		return (error);
 
 	sc = device_get_softc(dev);
 
@@ -938,7 +943,7 @@ ti_adc_detach(device_t dev)
 	if (sc->sc_mem_res)
 		bus_release_resource(dev, SYS_RES_MEMORY, 0, sc->sc_mem_res);
 
-	return (bus_generic_detach(dev));
+	return (0);
 }
 
 static device_method_t ti_adc_methods[] = {