The branch main has been updated by jhb:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=f5dfa6b98901e161bb7bac46034c6955e5baa0ee

commit f5dfa6b98901e161bb7bac46034c6955e5baa0ee
Author:     John Baldwin <[email protected]>
AuthorDate: 2022-05-09 19:22:04 +0000
Commit:     John Baldwin <[email protected]>
CommitDate: 2022-05-09 19:22:04 +0000

    tpm: Remove unused devclass arguments to DRIVER_MODULE.
---
 sys/dev/tpm/tpm_acpi.c | 4 ++--
 sys/dev/tpm/tpm_crb.c  | 4 ++--
 sys/dev/tpm/tpm_isa.c  | 4 +---
 sys/dev/tpm/tpm_tis.c  | 4 ++--
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/sys/dev/tpm/tpm_acpi.c b/sys/dev/tpm/tpm_acpi.c
index 12167e90c4a0..2ba66ae28771 100644
--- a/sys/dev/tpm/tpm_acpi.c
+++ b/sys/dev/tpm/tpm_acpi.c
@@ -72,9 +72,9 @@ static device_method_t tpm_acpi_methods[] = {
        DEVMETHOD(device_resume,        tpm_resume),
        { 0, 0 }
 };
+
 static driver_t tpm_acpi_driver = {
        "tpm", tpm_acpi_methods, sizeof(struct tpm_softc),
 };
 
-devclass_t tpm_devclass;
-DRIVER_MODULE(tpm, acpi, tpm_acpi_driver, tpm_devclass, 0, 0);
+DRIVER_MODULE(tpm, acpi, tpm_acpi_driver, 0, 0);
diff --git a/sys/dev/tpm/tpm_crb.c b/sys/dev/tpm/tpm_crb.c
index d45b714bffc4..5b9619ee9b24 100644
--- a/sys/dev/tpm/tpm_crb.c
+++ b/sys/dev/tpm/tpm_crb.c
@@ -415,9 +415,9 @@ static device_method_t      tpmcrb_methods[] = {
        DEVMETHOD(device_suspend,       tpm20_suspend),
        {0, 0}
 };
+
 static driver_t        tpmcrb_driver = {
        "tpmcrb", tpmcrb_methods, sizeof(struct tpmcrb_sc),
 };
 
-devclass_t tpmcrb_devclass;
-DRIVER_MODULE(tpmcrb, acpi, tpmcrb_driver, tpmcrb_devclass, 0, 0);
+DRIVER_MODULE(tpmcrb, acpi, tpmcrb_driver, 0, 0);
diff --git a/sys/dev/tpm/tpm_isa.c b/sys/dev/tpm/tpm_isa.c
index 861ca23cf9e5..c954f0ee377c 100644
--- a/sys/dev/tpm/tpm_isa.c
+++ b/sys/dev/tpm/tpm_isa.c
@@ -91,6 +91,4 @@ static driver_t tpm_driver = {
        "tpm", tpm_methods, sizeof(struct tpm_softc),
 };
 
-static devclass_t tpm_devclass;
-
-DRIVER_MODULE(tpm, isa, tpm_driver, tpm_devclass, 0, 0);
+DRIVER_MODULE(tpm, isa, tpm_driver, 0, 0);
diff --git a/sys/dev/tpm/tpm_tis.c b/sys/dev/tpm/tpm_tis.c
index 02779f2bf2f2..75541b23dc37 100644
--- a/sys/dev/tpm/tpm_tis.c
+++ b/sys/dev/tpm/tpm_tis.c
@@ -514,9 +514,9 @@ static device_method_t tpmtis_methods[] = {
        DEVMETHOD(device_suspend,       tpm20_suspend),
        {0, 0}
 };
+
 static driver_t        tpmtis_driver = {
        "tpmtis", tpmtis_methods, sizeof(struct tpm_sc),
 };
 
-devclass_t tpmtis_devclass;
-DRIVER_MODULE(tpmtis, acpi, tpmtis_driver, tpmtis_devclass, 0, 0);
+DRIVER_MODULE(tpmtis, acpi, tpmtis_driver, 0, 0);

Reply via email to