git: 83d5518c672a - main - security/quantis-kmod: Remove unused DRIVER_MODULE devclass on recent main.
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 20 May 2022 17:14:34 UTC
The branch main has been updated by jhb (doc, src committer): URL: https://cgit.FreeBSD.org/ports/commit/?id=83d5518c672a77a47247866eaefd350af1b85ef4 commit 83d5518c672a77a47247866eaefd350af1b85ef4 Author: John Baldwin <jhb@FreeBSD.org> AuthorDate: 2022-05-20 17:14:05 +0000 Commit: John Baldwin <jhb@FreeBSD.org> CommitDate: 2022-05-20 17:14:05 +0000 security/quantis-kmod: Remove unused DRIVER_MODULE devclass on recent main. Reviewed by: ale (maintainer) Differential Revision: https://reviews.freebsd.org/D35265 --- .../files/patch-freebsd_quantis__pci__freebsd.c | 29 +++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/security/quantis-kmod/files/patch-freebsd_quantis__pci__freebsd.c b/security/quantis-kmod/files/patch-freebsd_quantis__pci__freebsd.c index 1027ef172ab1..3d73996da1d8 100644 --- a/security/quantis-kmod/files/patch-freebsd_quantis__pci__freebsd.c +++ b/security/quantis-kmod/files/patch-freebsd_quantis__pci__freebsd.c @@ -1,6 +1,29 @@ ---- freebsd/quantis_pci_freebsd.c.orig 2022-04-26 15:35:51 UTC +--- freebsd/quantis_pci_freebsd.c.orig 2017-07-20 14:51:35 UTC +++ freebsd/quantis_pci_freebsd.c -@@ -287,7 +287,6 @@ static int quantis_detach(device_t device, struct quan +@@ -147,8 +147,6 @@ static struct cdevsw quantis_cdevsw = + .d_name = "quantis", + }; + +-static devclass_t quantis_devclass; +- + /** Keep track of the numbers of card we manage for the corresponding + ** IOCTL call. I guess this is already managed in some `device_t' + ** structure. +@@ -200,7 +198,13 @@ static int quantis_load(struct module *module, int cmd + } + + ++#if __FreeBSD_version >= 1400058 ++DRIVER_MODULE(quantis, pci, quantis_pci_driver, quantis_load, NULL); ++#else ++static devclass_t quantis_devclass; ++ + DRIVER_MODULE(quantis, pci, quantis_pci_driver, quantis_devclass, quantis_load, 0); ++#endif + + + static int quantis_pci_probe(device_t dev) +@@ -287,7 +291,6 @@ static int quantis_allocate_resources(device_t device) **/ static int quantis_allocate_resources(device_t device) { @@ -8,7 +31,7 @@ struct quantis_pci_device *scp = DEVICE2SOFTC(device); mtx_init(&scp->mutex, "Quantis Device Mutex", NULL, MTX_DEF); -@@ -301,7 +300,6 @@ static int quantis_allocate_resources(device_t device) +@@ -301,7 +304,6 @@ errexit: return (0); errexit: