git: ab050b2b8f1d - main - crypto: Remove unused devclass arguments to DRIVER_MODULE.
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 06 May 2022 23:25:19 UTC
The branch main has been updated by jhb:
URL: https://cgit.FreeBSD.org/src/commit/?id=ab050b2b8f1ddabe76f6642ab81d3d00b9976c07
commit ab050b2b8f1ddabe76f6642ab81d3d00b9976c07
Author: John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2022-05-06 22:46:58 +0000
Commit: John Baldwin <jhb@FreeBSD.org>
CommitDate: 2022-05-06 22:46:58 +0000
crypto: Remove unused devclass arguments to DRIVER_MODULE.
---
sys/crypto/aesni/aesni.c | 3 +--
sys/crypto/armv8/armv8_crypto.c | 4 +---
sys/crypto/blake2/blake2_cryptodev.c | 3 +--
sys/crypto/ccp/ccp.c | 3 +--
sys/crypto/openssl/ossl.c | 4 +---
sys/crypto/via/padlock.c | 3 +--
sys/opencrypto/cryptosoft.c | 3 +--
7 files changed, 7 insertions(+), 16 deletions(-)
diff --git a/sys/crypto/aesni/aesni.c b/sys/crypto/aesni/aesni.c
index a69488971cac..aa7a5702713a 100644
--- a/sys/crypto/aesni/aesni.c
+++ b/sys/crypto/aesni/aesni.c
@@ -416,9 +416,8 @@ static driver_t aesni_driver = {
aesni_methods,
sizeof(struct aesni_softc),
};
-static devclass_t aesni_devclass;
-DRIVER_MODULE(aesni, nexus, aesni_driver, aesni_devclass, 0, 0);
+DRIVER_MODULE(aesni, nexus, aesni_driver, 0, 0);
MODULE_VERSION(aesni, 1);
MODULE_DEPEND(aesni, crypto, 1, 1, 1);
diff --git a/sys/crypto/armv8/armv8_crypto.c b/sys/crypto/armv8/armv8_crypto.c
index 18b0870f380b..7c365c6a6901 100644
--- a/sys/crypto/armv8/armv8_crypto.c
+++ b/sys/crypto/armv8/armv8_crypto.c
@@ -502,7 +502,5 @@ static device_method_t armv8_crypto_methods[] = {
static DEFINE_CLASS_0(armv8crypto, armv8_crypto_driver, armv8_crypto_methods,
sizeof(struct armv8_crypto_softc));
-static devclass_t armv8_crypto_devclass;
-DRIVER_MODULE(armv8crypto, nexus, armv8_crypto_driver, armv8_crypto_devclass,
- 0, 0);
+DRIVER_MODULE(armv8crypto, nexus, armv8_crypto_driver, 0, 0);
diff --git a/sys/crypto/blake2/blake2_cryptodev.c b/sys/crypto/blake2/blake2_cryptodev.c
index 50828b0334d6..ebc3c2fcec96 100644
--- a/sys/crypto/blake2/blake2_cryptodev.c
+++ b/sys/crypto/blake2/blake2_cryptodev.c
@@ -253,9 +253,8 @@ static driver_t blake2_driver = {
blake2_methods,
sizeof(struct blake2_softc),
};
-static devclass_t blake2_devclass;
-DRIVER_MODULE(blake2, nexus, blake2_driver, blake2_devclass, 0, 0);
+DRIVER_MODULE(blake2, nexus, blake2_driver, 0, 0);
MODULE_VERSION(blake2, 1);
MODULE_DEPEND(blake2, crypto, 1, 1, 1);
diff --git a/sys/crypto/ccp/ccp.c b/sys/crypto/ccp/ccp.c
index b41b86f111cb..3f2b89545e8f 100644
--- a/sys/crypto/ccp/ccp.c
+++ b/sys/crypto/ccp/ccp.c
@@ -636,8 +636,7 @@ static driver_t ccp_driver = {
sizeof(struct ccp_softc)
};
-static devclass_t ccp_devclass;
-DRIVER_MODULE(ccp, pci, ccp_driver, ccp_devclass, NULL, NULL);
+DRIVER_MODULE(ccp, pci, ccp_driver, NULL, NULL);
MODULE_VERSION(ccp, 1);
MODULE_DEPEND(ccp, crypto, 1, 1, 1);
MODULE_DEPEND(ccp, random_device, 1, 1, 1);
diff --git a/sys/crypto/openssl/ossl.c b/sys/crypto/openssl/ossl.c
index f41ff09c371d..62af8f713d9f 100644
--- a/sys/crypto/openssl/ossl.c
+++ b/sys/crypto/openssl/ossl.c
@@ -437,8 +437,6 @@ static driver_t ossl_driver = {
sizeof(struct ossl_softc)
};
-static devclass_t ossl_devclass;
-
-DRIVER_MODULE(ossl, nexus, ossl_driver, ossl_devclass, NULL, NULL);
+DRIVER_MODULE(ossl, nexus, ossl_driver, NULL, NULL);
MODULE_VERSION(ossl, 1);
MODULE_DEPEND(ossl, crypto, 1, 1, 1);
diff --git a/sys/crypto/via/padlock.c b/sys/crypto/via/padlock.c
index c0435695b004..056c653eb24f 100644
--- a/sys/crypto/via/padlock.c
+++ b/sys/crypto/via/padlock.c
@@ -297,9 +297,8 @@ static driver_t padlock_driver = {
padlock_methods,
sizeof(struct padlock_softc),
};
-static devclass_t padlock_devclass;
/* XXX where to attach */
-DRIVER_MODULE(padlock, nexus, padlock_driver, padlock_devclass, 0, 0);
+DRIVER_MODULE(padlock, nexus, padlock_driver, 0, 0);
MODULE_VERSION(padlock, 1);
MODULE_DEPEND(padlock, crypto, 1, 1, 1);
diff --git a/sys/opencrypto/cryptosoft.c b/sys/opencrypto/cryptosoft.c
index 2aa7aecef146..0eb5bc420886 100644
--- a/sys/opencrypto/cryptosoft.c
+++ b/sys/opencrypto/cryptosoft.c
@@ -1742,7 +1742,6 @@ static driver_t swcr_driver = {
swcr_methods,
0, /* NB: no softc */
};
-static devclass_t swcr_devclass;
/*
* NB: We explicitly reference the crypto module so we
@@ -1753,6 +1752,6 @@ static devclass_t swcr_devclass;
*/
extern int crypto_modevent(struct module *, int, void *);
/* XXX where to attach */
-DRIVER_MODULE(cryptosoft, nexus, swcr_driver, swcr_devclass, crypto_modevent,0);
+DRIVER_MODULE(cryptosoft, nexus, swcr_driver, crypto_modevent, NULL);
MODULE_VERSION(cryptosoft, 1);
MODULE_DEPEND(cryptosoft, crypto, 1, 1, 1);