From b3407dcc5883f2f465d44aed2d107606311731a4 Mon Sep 17 00:00:00 2001 From: John Baldwin Date: Tue, 19 Apr 2022 14:08:04 -0700 Subject: [PATCH] cpufreq: Remove unused devclass arguments to DRIVER_MODULE. --- sys/dev/cpufreq/cpufreq_dt.c | 4 +--- sys/dev/cpufreq/ichss.c | 5 +++-- sys/powerpc/cpufreq/dfs.c | 3 +-- sys/powerpc/cpufreq/mpc85xx_jog.c | 3 +-- sys/powerpc/cpufreq/pcr.c | 3 +-- sys/powerpc/cpufreq/pmcr.c | 3 +-- sys/powerpc/cpufreq/pmufreq.c | 3 +-- sys/x86/cpufreq/est.c | 3 +-- sys/x86/cpufreq/hwpstate_amd.c | 3 +-- sys/x86/cpufreq/hwpstate_intel.c | 4 +--- sys/x86/cpufreq/p4tcc.c | 3 +-- sys/x86/cpufreq/powernow.c | 3 +-- sys/x86/cpufreq/smist.c | 4 ++-- 13 files changed, 16 insertions(+), 28 deletions(-) diff --git a/sys/dev/cpufreq/cpufreq_dt.c b/sys/dev/cpufreq/cpufreq_dt.c index ee5b15347fdc..a6c116f4aaa0 100644 --- a/sys/dev/cpufreq/cpufreq_dt.c +++ b/sys/dev/cpufreq/cpufreq_dt.c @@ -619,7 +619,5 @@ static driver_t cpufreq_dt_driver = { sizeof(struct cpufreq_dt_softc), }; -static devclass_t cpufreq_dt_devclass; - -DRIVER_MODULE(cpufreq_dt, cpu, cpufreq_dt_driver, cpufreq_dt_devclass, 0, 0); +DRIVER_MODULE(cpufreq_dt, cpu, cpufreq_dt_driver, 0, 0); MODULE_VERSION(cpufreq_dt, 1); diff --git a/sys/dev/cpufreq/ichss.c b/sys/dev/cpufreq/ichss.c index 3d0c09e06640..7c71824be10d 100644 --- a/sys/dev/cpufreq/ichss.c +++ b/sys/dev/cpufreq/ichss.c @@ -117,11 +117,12 @@ static device_method_t ichss_methods[] = { DEVMETHOD(cpufreq_drv_settings, ichss_settings), DEVMETHOD_END }; + static driver_t ichss_driver = { "ichss", ichss_methods, sizeof(struct ichss_softc) }; -static devclass_t ichss_devclass; -DRIVER_MODULE(ichss, cpu, ichss_driver, ichss_devclass, 0, 0); + +DRIVER_MODULE(ichss, cpu, ichss_driver, 0, 0); static device_t ich_device; diff --git a/sys/powerpc/cpufreq/dfs.c b/sys/powerpc/cpufreq/dfs.c index d5c605908951..6ee3fa7d48bc 100644 --- a/sys/powerpc/cpufreq/dfs.c +++ b/sys/powerpc/cpufreq/dfs.c @@ -71,8 +71,7 @@ static driver_t dfs_driver = { sizeof(struct dfs_softc) }; -static devclass_t dfs_devclass; -DRIVER_MODULE(dfs, cpu, dfs_driver, dfs_devclass, 0, 0); +DRIVER_MODULE(dfs, cpu, dfs_driver, 0, 0); /* * Bits of the HID1 register to enable DFS. See page 2-24 of "MPC7450 diff --git a/sys/powerpc/cpufreq/mpc85xx_jog.c b/sys/powerpc/cpufreq/mpc85xx_jog.c index ef2552f1485e..edced1237d71 100644 --- a/sys/powerpc/cpufreq/mpc85xx_jog.c +++ b/sys/powerpc/cpufreq/mpc85xx_jog.c @@ -97,8 +97,7 @@ static driver_t mpc85xx_jog_driver = { sizeof(struct mpc85xx_jog_softc) }; -static devclass_t mpc85xx_jog_devclass; -DRIVER_MODULE(mpc85xx_jog, cpu, mpc85xx_jog_driver, mpc85xx_jog_devclass, 0, 0); +DRIVER_MODULE(mpc85xx_jog, cpu, mpc85xx_jog_driver, 0, 0); struct mpc85xx_constraints { int threshold; /* Threshold frequency, in MHz, for setting CORE_SPD bit. */ diff --git a/sys/powerpc/cpufreq/pcr.c b/sys/powerpc/cpufreq/pcr.c index 4537b652d7f5..5480f2d33a89 100644 --- a/sys/powerpc/cpufreq/pcr.c +++ b/sys/powerpc/cpufreq/pcr.c @@ -74,8 +74,7 @@ static driver_t pcr_driver = { sizeof(struct pcr_softc) }; -static devclass_t pcr_devclass; -DRIVER_MODULE(pcr, cpu, pcr_driver, pcr_devclass, 0, 0); +DRIVER_MODULE(pcr, cpu, pcr_driver, 0, 0); /* * States diff --git a/sys/powerpc/cpufreq/pmcr.c b/sys/powerpc/cpufreq/pmcr.c index 9989dcc1506e..dad7d224f174 100644 --- a/sys/powerpc/cpufreq/pmcr.c +++ b/sys/powerpc/cpufreq/pmcr.c @@ -111,8 +111,7 @@ static driver_t pmcr_driver = { sizeof(struct pmcr_softc) }; -static devclass_t pmcr_devclass; -DRIVER_MODULE(pmcr, cpu, pmcr_driver, pmcr_devclass, 0, 0); +DRIVER_MODULE(pmcr, cpu, pmcr_driver, 0, 0); static void pmcr_identify(driver_t *driver, device_t parent) diff --git a/sys/powerpc/cpufreq/pmufreq.c b/sys/powerpc/cpufreq/pmufreq.c index 3c3d2ed3e811..e7e6fbd6a144 100644 --- a/sys/powerpc/cpufreq/pmufreq.c +++ b/sys/powerpc/cpufreq/pmufreq.c @@ -79,8 +79,7 @@ static driver_t pmufreq_driver = { sizeof(struct pmufreq_softc) }; -static devclass_t pmufreq_devclass; -DRIVER_MODULE(pmufreq, cpu, pmufreq_driver, pmufreq_devclass, 0, 0); +DRIVER_MODULE(pmufreq, cpu, pmufreq_driver, 0, 0); static void pmufreq_identify(driver_t *driver, device_t parent) diff --git a/sys/x86/cpufreq/est.c b/sys/x86/cpufreq/est.c index cdca2fdfec5f..8de07e6f978a 100644 --- a/sys/x86/cpufreq/est.c +++ b/sys/x86/cpufreq/est.c @@ -897,8 +897,7 @@ static driver_t est_driver = { sizeof(struct est_softc), }; -static devclass_t est_devclass; -DRIVER_MODULE(est, cpu, est_driver, est_devclass, 0, 0); +DRIVER_MODULE(est, cpu, est_driver, 0, 0); MODULE_DEPEND(est, hwpstate_intel, 1, 1, 1); static int diff --git a/sys/x86/cpufreq/hwpstate_amd.c b/sys/x86/cpufreq/hwpstate_amd.c index 3193cbd908cc..b62e23a548df 100644 --- a/sys/x86/cpufreq/hwpstate_amd.c +++ b/sys/x86/cpufreq/hwpstate_amd.c @@ -156,14 +156,13 @@ static device_method_t hwpstate_methods[] = { {0, 0} }; -static devclass_t hwpstate_devclass; static driver_t hwpstate_driver = { "hwpstate", hwpstate_methods, sizeof(struct hwpstate_softc), }; -DRIVER_MODULE(hwpstate, cpu, hwpstate_driver, hwpstate_devclass, 0, 0); +DRIVER_MODULE(hwpstate, cpu, hwpstate_driver, 0, 0); /* * Go to Px-state on all cpus, considering the limit register (if so diff --git a/sys/x86/cpufreq/hwpstate_intel.c b/sys/x86/cpufreq/hwpstate_intel.c index ae63cc6a6efe..50cbb6d96587 100644 --- a/sys/x86/cpufreq/hwpstate_intel.c +++ b/sys/x86/cpufreq/hwpstate_intel.c @@ -102,15 +102,13 @@ struct hwp_softc { uint8_t low; }; -static devclass_t hwpstate_intel_devclass; static driver_t hwpstate_intel_driver = { "hwpstate_intel", intel_hwpstate_methods, sizeof(struct hwp_softc), }; -DRIVER_MODULE(hwpstate_intel, cpu, hwpstate_intel_driver, - hwpstate_intel_devclass, NULL, NULL); +DRIVER_MODULE(hwpstate_intel, cpu, hwpstate_intel_driver, NULL, NULL); MODULE_VERSION(hwpstate_intel, 1); static bool hwpstate_pkg_ctrl_enable = true; diff --git a/sys/x86/cpufreq/p4tcc.c b/sys/x86/cpufreq/p4tcc.c index 4370da81cf06..e456f921b0de 100644 --- a/sys/x86/cpufreq/p4tcc.c +++ b/sys/x86/cpufreq/p4tcc.c @@ -106,8 +106,7 @@ static driver_t p4tcc_driver = { sizeof(struct p4tcc_softc), }; -static devclass_t p4tcc_devclass; -DRIVER_MODULE(p4tcc, cpu, p4tcc_driver, p4tcc_devclass, 0, 0); +DRIVER_MODULE(p4tcc, cpu, p4tcc_driver, 0, 0); static int p4tcc_features(driver_t *driver, u_int *features) diff --git a/sys/x86/cpufreq/powernow.c b/sys/x86/cpufreq/powernow.c index bc17c7e96999..28d59b225f8c 100644 --- a/sys/x86/cpufreq/powernow.c +++ b/sys/x86/cpufreq/powernow.c @@ -263,14 +263,13 @@ static device_method_t pn_methods[] = { {0, 0} }; -static devclass_t pn_devclass; static driver_t pn_driver = { "powernow", pn_methods, sizeof(struct pn_softc), }; -DRIVER_MODULE(powernow, cpu, pn_driver, pn_devclass, 0, 0); +DRIVER_MODULE(powernow, cpu, pn_driver, 0, 0); static int pn7_setfidvid(struct pn_softc *sc, int fid, int vid) diff --git a/sys/x86/cpufreq/smist.c b/sys/x86/cpufreq/smist.c index 129ec2d4884b..3810d9c9e781 100644 --- a/sys/x86/cpufreq/smist.c +++ b/sys/x86/cpufreq/smist.c @@ -106,8 +106,8 @@ static device_method_t smist_methods[] = { static driver_t smist_driver = { "smist", smist_methods, sizeof(struct smist_softc) }; -static devclass_t smist_devclass; -DRIVER_MODULE(smist, cpu, smist_driver, smist_devclass, 0, 0); + +DRIVER_MODULE(smist, cpu, smist_driver, 0, 0); struct piix4_pci_device { uint16_t vendor;