The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=1e55a130620e5bef3570c4e1d326412c614fba84
commit 1e55a130620e5bef3570c4e1d326412c614fba84 Author: Vladimir Kondratyev <[email protected]> AuthorDate: 2023-08-03 16:10:49 +0000 Commit: Vladimir Kondratyev <[email protected]> CommitDate: 2023-08-03 16:10:49 +0000 spibus(4): Skip bus_generic_detach() on device detach device_delete_children() detaches all children too. MFC after: 1 month Reviewed by: manu Differential Revision: https://reviews.freebsd.org/D41240 --- sys/dev/spibus/spibus.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/sys/dev/spibus/spibus.c b/sys/dev/spibus/spibus.c index 40ebb916a649..b9b3e8d28b83 100644 --- a/sys/dev/spibus/spibus.c +++ b/sys/dev/spibus/spibus.c @@ -70,13 +70,7 @@ spibus_attach(device_t dev) static int spibus_detach(device_t dev) { - int err; - - if ((err = bus_generic_detach(dev)) != 0) - return (err); - device_delete_children(dev); - - return (0); + return (device_delete_children(dev)); } static int
