diff options
| author | John Baldwin <jhb@FreeBSD.org> | 2025-01-02 18:21:02 +0000 |
|---|---|---|
| committer | John Baldwin <jhb@FreeBSD.org> | 2025-01-02 18:21:30 +0000 |
| commit | b196276c20b577b364372f1aa1a646b9ce34bf5c (patch) | |
| tree | 7cd0937a7495a49e682531df1bffb49e6aed48ad /sys/dev/iicbus | |
| parent | 28f5e880e8b28d77cf1a4eb6ce2a766d3c5a3926 (diff) | |
Diffstat (limited to 'sys/dev/iicbus')
| -rw-r--r-- | sys/dev/iicbus/controller/cadence/cdnc_i2c.c | 7 | ||||
| -rw-r--r-- | sys/dev/iicbus/controller/rockchip/rk_i2c.c | 4 | ||||
| -rw-r--r-- | sys/dev/iicbus/controller/twsi/twsi.c | 4 | ||||
| -rw-r--r-- | sys/dev/iicbus/controller/vybrid/vf_i2c.c | 6 |
4 files changed, 1 insertions, 20 deletions
diff --git a/sys/dev/iicbus/controller/cadence/cdnc_i2c.c b/sys/dev/iicbus/controller/cadence/cdnc_i2c.c index 3bed24c36070..bf1f88ec9ca5 100644 --- a/sys/dev/iicbus/controller/cadence/cdnc_i2c.c +++ b/sys/dev/iicbus/controller/cadence/cdnc_i2c.c @@ -626,18 +626,13 @@ cdnc_i2c_detach(device_t dev) { struct cdnc_i2c_softc *sc = device_get_softc(dev); - if (device_is_attached(dev)) - bus_generic_detach(dev); + bus_generic_detach(dev); if (sc->ref_clk != NULL) { clk_release(sc->ref_clk); sc->ref_clk = NULL; } - /* Delete iic bus. */ - if (sc->iicbus) - device_delete_child(dev, sc->iicbus); - /* Disable hardware. */ if (sc->mem_res != NULL) { sc->cfg_reg_shadow = 0; diff --git a/sys/dev/iicbus/controller/rockchip/rk_i2c.c b/sys/dev/iicbus/controller/rockchip/rk_i2c.c index 0ef65d1121f5..9317adbcfd98 100644 --- a/sys/dev/iicbus/controller/rockchip/rk_i2c.c +++ b/sys/dev/iicbus/controller/rockchip/rk_i2c.c @@ -686,10 +686,6 @@ rk_i2c_detach(device_t dev) if ((error = bus_generic_detach(dev)) != 0) return (error); - if (sc->iicbus != NULL) - if ((error = device_delete_child(dev, sc->iicbus)) != 0) - return (error); - if (sc->sclk != NULL) clk_release(sc->sclk); if (sc->pclk != NULL) diff --git a/sys/dev/iicbus/controller/twsi/twsi.c b/sys/dev/iicbus/controller/twsi/twsi.c index 20d39aa7d93b..b5aefbae7d7e 100644 --- a/sys/dev/iicbus/controller/twsi/twsi.c +++ b/sys/dev/iicbus/controller/twsi/twsi.c @@ -835,10 +835,6 @@ twsi_detach(device_t dev) if ((rv = bus_generic_detach(dev)) != 0) return (rv); - if (sc->iicbus != NULL) - if ((rv = device_delete_child(dev, sc->iicbus)) != 0) - return (rv); - if (sc->intrhand != NULL) bus_teardown_intr(sc->dev, sc->res[1], sc->intrhand); diff --git a/sys/dev/iicbus/controller/vybrid/vf_i2c.c b/sys/dev/iicbus/controller/vybrid/vf_i2c.c index f6d0eb4c2c59..4735a95cf5cd 100644 --- a/sys/dev/iicbus/controller/vybrid/vf_i2c.c +++ b/sys/dev/iicbus/controller/vybrid/vf_i2c.c @@ -213,12 +213,6 @@ i2c_detach(device_t dev) return (error); } - error = device_delete_child(dev, sc->iicbus); - if (error != 0) { - device_printf(dev, "could not delete iicbus child.\n"); - return (error); - } - mtx_lock(&sc->mutex); if (sc->freq == 0) { |