diff options
| author | Warner Losh <imp@FreeBSD.org> | 2021-12-09 23:52:44 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2021-12-10 00:04:57 +0000 |
| commit | d14bc7230ba5c26de7d793ae3947e7571dc8fb7c (patch) | |
| tree | a7c3c8fff392e6d2e98f1565c74239a98b9e1515 /sys/dev/bhnd | |
| parent | 815a0973b23cf97e3e6c2d8bd34d98d54e318873 (diff) | |
Diffstat (limited to 'sys/dev/bhnd')
| -rw-r--r-- | sys/dev/bhnd/bhnd.c | 4 | ||||
| -rw-r--r-- | sys/dev/bhnd/bhnd_subr.c | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/sys/dev/bhnd/bhnd.c b/sys/dev/bhnd/bhnd.c index 654f42864233..0413970e5665 100644 --- a/sys/dev/bhnd/bhnd.c +++ b/sys/dev/bhnd/bhnd.c @@ -374,7 +374,7 @@ bhnd_generic_alloc_pmu(device_t dev, device_t child) u_int max_latency; int error; - GIANT_REQUIRED; /* for newbus */ + bus_topo_assert(); if (device_get_parent(child) != dev) return (EINVAL); @@ -490,7 +490,7 @@ bhnd_generic_release_pmu(device_t dev, device_t child) struct bhnd_resource *r; device_t pmu_dev; - GIANT_REQUIRED; /* for newbus */ + bus_topo_assert(); sc = device_get_softc(dev); diff --git a/sys/dev/bhnd/bhnd_subr.c b/sys/dev/bhnd/bhnd_subr.c index 036c3def5817..955e1a197002 100644 --- a/sys/dev/bhnd/bhnd_subr.c +++ b/sys/dev/bhnd/bhnd_subr.c @@ -2185,8 +2185,7 @@ bhnd_bus_generic_get_nvram_var(device_t dev, device_t child, const char *name, device_t nvram; device_t parent; - /* Make sure we're holding Giant for newbus */ - GIANT_REQUIRED; + bus_topo_assert(); /* Look for a directly-attached NVRAM child */ if ((nvram = device_find_child(dev, "bhnd_nvram", -1)) != NULL) |