The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=0fdf5bc531fbde4fa80a85614ba40230062ebde4
commit 0fdf5bc531fbde4fa80a85614ba40230062ebde4 Author: John Baldwin <j...@freebsd.org> AuthorDate: 2022-05-06 00:02:39 +0000 Commit: John Baldwin <j...@freebsd.org> CommitDate: 2022-05-06 00:02:39 +0000 Remove extraneous devclass argument from DRIVER_MODULE_ORDERED6. This is the variant of DRIVER_MODULE_ORDERED that does not accept a devclass argument. Fixes: 2a99dd30dfaa Deprecate the 'devclass' argument from *DRIVER_MODULE() macros. --- sys/sys/bus.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/sys/bus.h b/sys/sys/bus.h index c9d10ab9afaf..a1d11138a1cc 100644 --- a/sys/sys/bus.h +++ b/sys/sys/bus.h @@ -853,8 +853,7 @@ DECLARE_MODULE(name##_##busname, name##_##busname##_mod, \ EARLY_DRIVER_MODULE_ORDERED8(name, busname, driver, devclass, \ evh, arg, order, BUS_PASS_DEFAULT) -#define DRIVER_MODULE_ORDERED6(name, busname, driver, devclass, evh, arg,\ - order) \ +#define DRIVER_MODULE_ORDERED6(name, busname, driver, evh, arg, order) \ EARLY_DRIVER_MODULE_ORDERED7(name, busname, driver, evh, arg, \ order, BUS_PASS_DEFAULT)