Page MenuHomeFreeBSD
Files F115918566

D47369.diff
No OneTemporary
Actions

D47369.diff
View Options

diff --git a/sys/dev/gpio/gpiobus.c b/sys/dev/gpio/gpiobus.c
--- a/sys/dev/gpio/gpiobus.c
+++ b/sys/dev/gpio/gpiobus.c
@@ -574,9 +574,7 @@
gpiobus_detach(device_t dev)
{
struct gpiobus_softc *sc;
- struct gpiobus_ivar *devi;
- device_t *devlist;
- int i, err, ndevs;
+ int i, err;
sc = GPIOBUS_SOFTC(dev);
KASSERT(mtx_initialized(&sc->sc_mtx),
@@ -585,17 +583,9 @@
if ((err = bus_generic_detach(dev)) != 0)
return (err);
-
- if ((err = device_get_children(dev, &devlist, &ndevs)) != 0)
+ if ((err = device_delete_children(dev)) != 0)
return (err);
- for (i = 0; i < ndevs; i++) {
- devi = GPIOBUS_IVAR(devlist[i]);
- gpiobus_free_ivars(devi);
- resource_list_free(&devi->rl);
- free(devi, M_DEVBUF);
- device_delete_child(dev, devlist[i]);
- }
- free(devlist, M_TEMP);
+
rman_fini(&sc->sc_intr_rman);
if (sc->sc_pins) {
for (i = 0; i < sc->sc_npins; i++) {
@@ -699,6 +689,19 @@
return (child);
}
+static void
+gpiobus_child_deleted(device_t dev, device_t child)
+{
+ struct gpiobus_ivar *devi;
+
+ devi = GPIOBUS_IVAR(child);
+ if (devi == NULL)
+ return;
+ gpiobus_free_ivars(devi);
+ resource_list_free(&devi->rl);
+ free(devi, M_DEVBUF);
+}
+
static int
gpiobus_rescan(device_t dev)
{
@@ -718,7 +721,6 @@
gpiobus_hinted_child(device_t bus, const char *dname, int dunit)
{
struct gpiobus_softc *sc = GPIOBUS_SOFTC(bus);
- struct gpiobus_ivar *devi;
device_t child;
const char *pins;
int irq, pinmask;
@@ -728,19 +730,14 @@
}
child = BUS_ADD_CHILD(bus, 0, dname, dunit);
- devi = GPIOBUS_IVAR(child);
if (resource_int_value(dname, dunit, "pins", &pinmask) == 0) {
if (gpiobus_parse_pins(sc, child, pinmask)) {
- resource_list_free(&devi->rl);
- free(devi, M_DEVBUF);
device_delete_child(bus, child);
return;
}
}
else if (resource_string_value(dname, dunit, "pin_list", &pins) == 0) {
if (gpiobus_parse_pin_list(sc, child, pins)) {
- resource_list_free(&devi->rl);
- free(devi, M_DEVBUF);
device_delete_child(bus, child);
return;
}
@@ -1045,6 +1042,7 @@
DEVMETHOD(bus_get_resource_list, gpiobus_get_resource_list),
DEVMETHOD(bus_get_rman, gpiobus_get_rman),
DEVMETHOD(bus_add_child, gpiobus_add_child),
+ DEVMETHOD(bus_child_deleted, gpiobus_child_deleted),
DEVMETHOD(bus_rescan, gpiobus_rescan),
DEVMETHOD(bus_probe_nomatch, gpiobus_probe_nomatch),
DEVMETHOD(bus_print_child, gpiobus_print_child),

File Metadata

Mime Type
text/plain
Expires
Thu, May 1, 9:59 AM (15 h, 32 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
17879067
Default Alt Text
D47369.diff (2 KB)

Event Timeline