diff options
| author | John Baldwin <jhb@FreeBSD.org> | 2024-03-13 22:05:54 +0000 |
|---|---|---|
| committer | John Baldwin <jhb@FreeBSD.org> | 2024-03-13 22:05:54 +0000 |
| commit | 9dbf5b0e6876d8c93890754bcc9c748339de79c0 (patch) | |
| tree | e66b390b26cf9f10c541a80c8606789649e191c1 /sys/dev/pccbb/pccbb.c | |
| parent | 2baed46e85d33b1f99e6f96033acc85a9a6fbba4 (diff) | |
| download | src-9dbf5b0e6876d8c93890754bcc9c748339de79c0.tar.gz src-9dbf5b0e6876d8c93890754bcc9c748339de79c0.zip | |
new-bus: Remove the 'rid' and 'type' arguments from BUS_RELEASE_RESOURCE
The public bus_release_resource() API still accepts both forms, but
the internal kobj method no longer passes the arguments.
Implementations which need the rid or type now use rman_get_rid() or
rman_get_type() to fetch the value from the allocated resource.
Reviewed by: imp
Differential Revision: https://reviews.freebsd.org/D44131
Diffstat (limited to 'sys/dev/pccbb/pccbb.c')
| -rw-r--r-- | sys/dev/pccbb/pccbb.c | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/sys/dev/pccbb/pccbb.c b/sys/dev/pccbb/pccbb.c index 302b9d75c864..c40261be4724 100644 --- a/sys/dev/pccbb/pccbb.c +++ b/sys/dev/pccbb/pccbb.c @@ -162,7 +162,7 @@ static struct resource *cbb_cardbus_alloc_resource(device_t brdev, device_t child, int type, int *rid, rman_res_t start, rman_res_t end, rman_res_t count, u_int flags); static int cbb_cardbus_release_resource(device_t brdev, device_t child, - int type, int rid, struct resource *res); + struct resource *res); static int cbb_cardbus_power_enable_socket(device_t brdev, device_t child); static int cbb_cardbus_power_disable_socket(device_t brdev, @@ -1263,20 +1263,20 @@ cbb_cardbus_alloc_resource(device_t brdev, device_t child, int type, } static int -cbb_cardbus_release_resource(device_t brdev, device_t child, int type, - int rid, struct resource *res) +cbb_cardbus_release_resource(device_t brdev, device_t child, + struct resource *res) { struct cbb_softc *sc = device_get_softc(brdev); int error; if (rman_get_flags(res) & RF_ACTIVE) { - error = bus_deactivate_resource(child, type, rid, res); + error = bus_deactivate_resource(child, res); if (error != 0) return (error); } cbb_remove_res(sc, res); return (BUS_RELEASE_RESOURCE(device_get_parent(brdev), child, - type, rid, res)); + res)); } /************************************************************************/ @@ -1424,20 +1424,20 @@ cbb_pcic_alloc_resource(device_t brdev, device_t child, int type, int *rid, } static int -cbb_pcic_release_resource(device_t brdev, device_t child, int type, - int rid, struct resource *res) +cbb_pcic_release_resource(device_t brdev, device_t child, + struct resource *res) { struct cbb_softc *sc = device_get_softc(brdev); int error; if (rman_get_flags(res) & RF_ACTIVE) { - error = bus_deactivate_resource(child, type, rid, res); + error = bus_deactivate_resource(child, res); if (error != 0) return (error); } cbb_remove_res(sc, res); return (BUS_RELEASE_RESOURCE(device_get_parent(brdev), child, - type, rid, res)); + res)); } /************************************************************************/ @@ -1519,17 +1519,14 @@ cbb_alloc_resource(device_t brdev, device_t child, int type, int *rid, } int -cbb_release_resource(device_t brdev, device_t child, int type, int rid, - struct resource *r) +cbb_release_resource(device_t brdev, device_t child, struct resource *r) { struct cbb_softc *sc = device_get_softc(brdev); if (sc->flags & CBB_16BIT_CARD) - return (cbb_pcic_release_resource(brdev, child, type, - rid, r)); + return (cbb_pcic_release_resource(brdev, child, r)); else - return (cbb_cardbus_release_resource(brdev, child, type, - rid, r)); + return (cbb_cardbus_release_resource(brdev, child, r)); } int |