Date: Fri, 20 May 2022 17:14:30 GMT From: John Baldwin <jhb@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 7175e1ab5ff1 - main - comms/opencbm-kmod: Remove unused DRIVER_MODULE devclass on recent main. Message-ID: <202205201714.24KHEU79044395@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jhb (doc, src committer): URL: https://cgit.FreeBSD.org/ports/commit/?id=7175e1ab5ff183bd561a8b4c97f2941c84366a22 commit 7175e1ab5ff183bd561a8b4c97f2941c84366a22 Author: John Baldwin <jhb@FreeBSD.org> AuthorDate: 2022-05-20 17:10:09 +0000 Commit: John Baldwin <jhb@FreeBSD.org> CommitDate: 2022-05-20 17:10:25 +0000 comms/opencbm-kmod: Remove unused DRIVER_MODULE devclass on recent main. Reviewed by: Felix Palmen <elix_palmen@it.de> (maintainer) Differential Revision: https://reviews.freebsd.org/D35195 --- .../files/patch-opencbm_sys_freebsd_opencbm.c | 25 ++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/comms/opencbm/files/patch-opencbm_sys_freebsd_opencbm.c b/comms/opencbm/files/patch-opencbm_sys_freebsd_opencbm.c new file mode 100644 index 000000000000..4495b8f9e936 --- /dev/null +++ b/comms/opencbm/files/patch-opencbm_sys_freebsd_opencbm.c @@ -0,0 +1,25 @@ +--- opencbm/sys/freebsd/opencbm.c.orig 2022-05-13 16:48:06 UTC ++++ opencbm/sys/freebsd/opencbm.c +@@ -133,8 +133,6 @@ static struct cdevsw cbm_cdevsw = { + .d_name = CBM_NAME + }; + +-static devclass_t cbm_devclass; +- + /* forward references for parallel burst routines */ + int cbm_parallel_burst_read_track(struct cbm_data *sc, device_t ppbus, + unsigned char *buffer); +@@ -930,7 +928,13 @@ static driver_t cbm_driver = { + sizeof(struct cbm_data) + }; + ++#if __FreeBSD_version >= 1400058 ++DRIVER_MODULE(cbm, ppbus, cbm_driver, 0, 0); ++#else ++static devclass_t cbm_devclass; ++ + DRIVER_MODULE(cbm, ppbus, cbm_driver, cbm_devclass, 0, 0); ++#endif + MODULE_DEPEND(cbm, ppbus, 1, 1, 1); + + /*
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202205201714.24KHEU79044395>