From nobody Mon May 09 19:22:33 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id E3DA11AC04A6; Mon, 9 May 2022 19:22:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KxrfL1Jn0z3nYh; Mon, 9 May 2022 19:22:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652124154; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XG+zGMLN+e2Cof12lGb1UlW9xhoVVcVEAcNtDux/ybg=; b=BLldPdg6DACsSnd5XmUhmgREElrk4l/AOMdn1w8xaVogntTh0bjIvKdmYmYUlrXwTRF6wR 7QEQqPLebV2IHMXM7x/8NOlfQ3Y/RxZAOG4ZqBpqCpgCTn1om6ag8VM59FlvjwfUd7Jccv mfpKhZ73C/lJpf5/2eDp9fpoJsnyCd5rKZKJhQRuxR7EaiEc09pgieypYvHKk8UTtI/Uqg sfPXMOzvI5XeCOf62ta2AkMLplDlXnFHpoynShjSK/HJNAhJRB5wmj2PFqpjg2fUKWZ1Jt c6zesXkJ8W+tsMSowcHgNzWvmFsJ8DrvC2Z/ANveZygDQ3e9hjSO991VIzca1g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B735116E8E; Mon, 9 May 2022 19:22:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 249JMXLr085014; Mon, 9 May 2022 19:22:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 249JMXp0085013; Mon, 9 May 2022 19:22:33 GMT (envelope-from git) Date: Mon, 9 May 2022 19:22:33 GMT Message-Id: <202205091922.249JMXp0085013@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 162c26ad772e - main - bhnd: Remove unused devclass arguments to DRIVER_MODULE. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 162c26ad772e6eafee49af0bbedbf40eb62a158e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652124154; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XG+zGMLN+e2Cof12lGb1UlW9xhoVVcVEAcNtDux/ybg=; b=Pr6W149oYA7tt3sFENfelNEPrzFoQ5dJ1w31TZOUSIXieRaJI30FbWdWg67LqkTwh/695T 5lpkLvCZv5bsegCvecfm6iuPnew5UVPvdU63P+wgZNsQuDs7tkEGdDO9MdHYCcopSYV8kU 2Y1KclLH9UPf1+H/9N4a4Uyvdcocgdo0IsMhMu9hE+I1ptOsWPajhdFNS/W8bitXmFtopT +TYq67gkRh8XdHsf5zIzLRRiqtBockHh+MQfeaIn4PCeA/+atTP44Zi/JnoSK9fauTzNPt fF8L4fM2tqpExl6fM8oCotJIQC8KqwNZzp+EK+XTF4JRWUYVQVN72m9iXXcetQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652124154; a=rsa-sha256; cv=none; b=vNKyvX2Ju7zmpfz/xiFfayefD2gwadAN4hPAUAohFkNXPBcuGF7yBm9z8gtlRyEttqwoxq bvWCGe/HUN5iVN5qZCRUyYcN9ftgo3edYsKSjFAmER9Ii0UM64fY9Mz8FBQcZbpfNImgt5 VLaOO/7j11GAonNlMjxvfZ70zyjfHmROCk8jqpEI/2U9dsKf0/ai0QilB1ZO6PpZjwlH4T HSmzF0ohTmdlbjT6Q/ye0UW1shRkp158lg/ZiBimNBGjbX5MRrI5hUcAaUsrVL9ZNrdSgI fcEY+P9e52h8dopt8tyMyaaGsfoxTbYTppxq4CojJTpz6R4SCb+e3b0TdQUKaA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=162c26ad772e6eafee49af0bbedbf40eb62a158e commit 162c26ad772e6eafee49af0bbedbf40eb62a158e Author: John Baldwin AuthorDate: 2022-05-09 19:22:00 +0000 Commit: John Baldwin CommitDate: 2022-05-09 19:22:00 +0000 bhnd: Remove unused devclass arguments to DRIVER_MODULE. --- sys/dev/bhnd/bcma/bcma_bhndb.c | 2 +- sys/dev/bhnd/bhnd.c | 4 ---- sys/dev/bhnd/bhnd.h | 4 ---- sys/dev/bhnd/bhndb/bhndb_pci_sprom.c | 2 +- sys/dev/bhnd/cores/chipc/bhnd_pmu_chipc.c | 2 +- sys/dev/bhnd/cores/chipc/bhnd_sprom_chipc.c | 2 +- sys/dev/bhnd/cores/chipc/chipc.c | 4 +--- sys/dev/bhnd/cores/chipc/chipc_gpio.c | 6 ++---- sys/dev/bhnd/cores/chipc/chipc_spi.c | 5 +---- sys/dev/bhnd/cores/chipc/chipcvar.h | 1 - sys/dev/bhnd/cores/chipc/pwrctl/bhnd_pwrctl.c | 2 +- sys/dev/bhnd/cores/pci/bhnd_pci_hostb.c | 2 +- sys/dev/bhnd/cores/pci/bhnd_pcib.c | 3 +-- sys/dev/bhnd/cores/pcie2/bhnd_pcie2_hostb.c | 2 +- sys/dev/bhnd/cores/pcie2/bhnd_pcie2b.c | 3 +-- sys/dev/bhnd/cores/pmu/bhnd_pmu.c | 2 -- sys/dev/bhnd/cores/pmu/bhnd_pmu_core.c | 4 ++-- sys/dev/bhnd/cores/pmu/bhnd_pmuvar.h | 1 - sys/dev/bhnd/cores/usb/bhnd_ehci.c | 4 +--- sys/dev/bhnd/cores/usb/bhnd_ohci.c | 4 +--- sys/dev/bhnd/cores/usb/bhnd_usb.c | 4 +--- sys/dev/bhnd/siba/siba_bhndb.c | 2 +- 22 files changed, 19 insertions(+), 46 deletions(-) diff --git a/sys/dev/bhnd/bcma/bcma_bhndb.c b/sys/dev/bhnd/bcma/bcma_bhndb.c index b0f2ca4a8c04..bd89e2f18483 100644 --- a/sys/dev/bhnd/bcma/bcma_bhndb.c +++ b/sys/dev/bhnd/bcma/bcma_bhndb.c @@ -168,7 +168,7 @@ static device_method_t bcma_bhndb_methods[] = { DEFINE_CLASS_2(bhnd, bcma_bhndb_driver, bcma_bhndb_methods, sizeof(struct bcma_softc), bhnd_bhndb_driver, bcma_driver); -DRIVER_MODULE(bcma_bhndb, bhndb, bcma_bhndb_driver, bhnd_devclass, NULL, NULL); +DRIVER_MODULE(bcma_bhndb, bhndb, bcma_bhndb_driver, NULL, NULL); MODULE_VERSION(bcma_bhndb, 1); MODULE_DEPEND(bcma_bhndb, bcma, 1, 1, 1); diff --git a/sys/dev/bhnd/bhnd.c b/sys/dev/bhnd/bhnd.c index d393c30f160d..d4b1e1de5257 100644 --- a/sys/dev/bhnd/bhnd.c +++ b/sys/dev/bhnd/bhnd.c @@ -1164,9 +1164,5 @@ static device_method_t bhnd_methods[] = { DEVMETHOD_END }; -devclass_t bhnd_devclass; /**< bhnd bus. */ -devclass_t bhnd_hostb_devclass; /**< bhnd bus host bridge. */ -devclass_t bhnd_nvram_devclass; /**< bhnd NVRAM device */ - DEFINE_CLASS_0(bhnd, bhnd_driver, bhnd_methods, sizeof(struct bhnd_softc)); MODULE_VERSION(bhnd, 1); diff --git a/sys/dev/bhnd/bhnd.h b/sys/dev/bhnd/bhnd.h index 3482b4dd174b..8e883e408139 100644 --- a/sys/dev/bhnd/bhnd.h +++ b/sys/dev/bhnd/bhnd.h @@ -54,10 +54,6 @@ #include "nvram/bhnd_nvram.h" -extern devclass_t bhnd_devclass; -extern devclass_t bhnd_hostb_devclass; -extern devclass_t bhnd_nvram_devclass; - #define BHND_CHIPID_MAX_NAMELEN 32 /**< maximum buffer required for a bhnd_format_chip_id() */ diff --git a/sys/dev/bhnd/bhndb/bhndb_pci_sprom.c b/sys/dev/bhnd/bhndb/bhndb_pci_sprom.c index b376f0d36f1f..862cc1688fb2 100644 --- a/sys/dev/bhnd/bhndb/bhndb_pci_sprom.c +++ b/sys/dev/bhnd/bhndb/bhndb_pci_sprom.c @@ -83,7 +83,7 @@ static device_method_t bhndb_pci_sprom_methods[] = { DEFINE_CLASS_1(bhnd_nvram, bhndb_pci_sprom_driver, bhndb_pci_sprom_methods, sizeof(struct bhnd_sprom_softc), bhnd_sprom_driver); -DRIVER_MODULE(bhndb_pci_sprom, bhndb, bhndb_pci_sprom_driver, bhnd_nvram_devclass, NULL, NULL); +DRIVER_MODULE(bhndb_pci_sprom, bhndb, bhndb_pci_sprom_driver, NULL, NULL); MODULE_DEPEND(bhndb_pci_sprom, bhnd, 1, 1, 1); MODULE_DEPEND(bhndb_pci_sprom, bhnd_sprom, 1, 1, 1); MODULE_VERSION(bhndb_pci_sprom, 1); diff --git a/sys/dev/bhnd/cores/chipc/bhnd_pmu_chipc.c b/sys/dev/bhnd/cores/chipc/bhnd_pmu_chipc.c index d04702c10f97..94a071cc3353 100644 --- a/sys/dev/bhnd/cores/chipc/bhnd_pmu_chipc.c +++ b/sys/dev/bhnd/cores/chipc/bhnd_pmu_chipc.c @@ -119,7 +119,7 @@ static device_method_t bhnd_pmu_chipc_methods[] = { DEFINE_CLASS_1(bhnd_pmu, bhnd_pmu_chipc_driver, bhnd_pmu_chipc_methods, sizeof(struct bhnd_pmu_softc), bhnd_pmu_driver); EARLY_DRIVER_MODULE(bhnd_pmu_chipc, bhnd_chipc, bhnd_pmu_chipc_driver, - bhnd_pmu_devclass, NULL, NULL, BUS_PASS_TIMER + BUS_PASS_ORDER_MIDDLE); + NULL, NULL, BUS_PASS_TIMER + BUS_PASS_ORDER_MIDDLE); MODULE_DEPEND(bhnd_pmu_chipc, bhnd, 1, 1, 1); MODULE_VERSION(bhnd_pmu_chipc, 1); diff --git a/sys/dev/bhnd/cores/chipc/bhnd_sprom_chipc.c b/sys/dev/bhnd/cores/chipc/bhnd_sprom_chipc.c index 0e1c36a7c9da..3c73384e6d61 100644 --- a/sys/dev/bhnd/cores/chipc/bhnd_sprom_chipc.c +++ b/sys/dev/bhnd/cores/chipc/bhnd_sprom_chipc.c @@ -104,7 +104,7 @@ static device_method_t chipc_sprom_methods[] = { }; DEFINE_CLASS_1(bhnd_nvram, chipc_sprom_driver, chipc_sprom_methods, sizeof(struct bhnd_sprom_softc), bhnd_sprom_driver); -DRIVER_MODULE(bhnd_chipc_sprom, bhnd_chipc, chipc_sprom_driver, bhnd_nvram_devclass, NULL, NULL); +DRIVER_MODULE(bhnd_chipc_sprom, bhnd_chipc, chipc_sprom_driver, NULL, NULL); MODULE_DEPEND(bhnd_chipc_sprom, bhnd, 1, 1, 1); MODULE_DEPEND(bhnd_chipc_sprom, bhnd_chipc, 1, 1, 1); diff --git a/sys/dev/bhnd/cores/chipc/chipc.c b/sys/dev/bhnd/cores/chipc/chipc.c index 678b2104f4e8..594366d32594 100644 --- a/sys/dev/bhnd/cores/chipc/chipc.c +++ b/sys/dev/bhnd/cores/chipc/chipc.c @@ -68,8 +68,6 @@ __FBSDID("$FreeBSD$"); #include "chipc_private.h" -devclass_t bhnd_chipc_devclass; /**< bhnd(4) chipcommon device class */ - static struct bhnd_device_quirk chipc_quirks[]; /* Supported device identifiers */ @@ -1421,7 +1419,7 @@ static device_method_t chipc_methods[] = { }; DEFINE_CLASS_0(bhnd_chipc, bhnd_chipc_driver, chipc_methods, sizeof(struct chipc_softc)); -EARLY_DRIVER_MODULE(bhnd_chipc, bhnd, bhnd_chipc_driver, bhnd_chipc_devclass, 0, 0, +EARLY_DRIVER_MODULE(bhnd_chipc, bhnd, bhnd_chipc_driver, 0, 0, BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE); MODULE_DEPEND(bhnd_chipc, bhnd, 1, 1, 1); MODULE_VERSION(bhnd_chipc, 1); diff --git a/sys/dev/bhnd/cores/chipc/chipc_gpio.c b/sys/dev/bhnd/cores/chipc/chipc_gpio.c index 7c75259c226f..5f8991ea9908 100644 --- a/sys/dev/bhnd/cores/chipc/chipc_gpio.c +++ b/sys/dev/bhnd/cores/chipc/chipc_gpio.c @@ -834,11 +834,9 @@ static device_method_t chipc_gpio_methods[] = { DEVMETHOD_END }; -static devclass_t gpio_devclass; - DEFINE_CLASS_0(gpio, chipc_gpio_driver, chipc_gpio_methods, sizeof(struct chipc_gpio_softc)); -EARLY_DRIVER_MODULE(chipc_gpio, bhnd_chipc, chipc_gpio_driver, - gpio_devclass, NULL, NULL, BUS_PASS_RESOURCE + BUS_PASS_ORDER_MIDDLE); +EARLY_DRIVER_MODULE(chipc_gpio, bhnd_chipc, chipc_gpio_driver, NULL, NULL, + BUS_PASS_RESOURCE + BUS_PASS_ORDER_MIDDLE); MODULE_DEPEND(chipc_gpio, bhnd, 1, 1, 1); MODULE_DEPEND(chipc_gpio, gpiobus, 1, 1, 1); diff --git a/sys/dev/bhnd/cores/chipc/chipc_spi.c b/sys/dev/bhnd/cores/chipc/chipc_spi.c index 045015da01aa..2365779994fe 100644 --- a/sys/dev/bhnd/cores/chipc/chipc_spi.c +++ b/sys/dev/bhnd/cores/chipc/chipc_spi.c @@ -276,7 +276,4 @@ static driver_t chipc_spi_driver = { sizeof(struct chipc_spi_softc), }; -static devclass_t chipc_spi_devclass; - -DRIVER_MODULE(chipc_spi, bhnd_chipc, chipc_spi_driver, chipc_spi_devclass, - 0, 0); +DRIVER_MODULE(chipc_spi, bhnd_chipc, chipc_spi_driver, 0, 0); diff --git a/sys/dev/bhnd/cores/chipc/chipcvar.h b/sys/dev/bhnd/cores/chipc/chipcvar.h index a7ae1259aa4d..332cf1deee34 100644 --- a/sys/dev/bhnd/cores/chipc/chipcvar.h +++ b/sys/dev/bhnd/cores/chipc/chipcvar.h @@ -46,7 +46,6 @@ #include "chipc.h" DECLARE_CLASS(bhnd_chipc_driver); -extern devclass_t bhnd_chipc_devclass; struct chipc_region; diff --git a/sys/dev/bhnd/cores/chipc/pwrctl/bhnd_pwrctl.c b/sys/dev/bhnd/cores/chipc/pwrctl/bhnd_pwrctl.c index 598f102fbe58..198b700caf25 100644 --- a/sys/dev/bhnd/cores/chipc/pwrctl/bhnd_pwrctl.c +++ b/sys/dev/bhnd/cores/chipc/pwrctl/bhnd_pwrctl.c @@ -487,7 +487,7 @@ static device_method_t bhnd_pwrctl_methods[] = { DEFINE_CLASS_0(bhnd_pwrctl, bhnd_pwrctl_driver, bhnd_pwrctl_methods, sizeof(struct bhnd_pwrctl_softc)); EARLY_DRIVER_MODULE(bhnd_pwrctl, bhnd_chipc, bhnd_pwrctl_driver, - bhnd_pmu_devclass, NULL, NULL, BUS_PASS_TIMER + BUS_PASS_ORDER_MIDDLE); + NULL, NULL, BUS_PASS_TIMER + BUS_PASS_ORDER_MIDDLE); MODULE_DEPEND(bhnd_pwrctl, bhnd, 1, 1, 1); MODULE_VERSION(bhnd_pwrctl, 1); diff --git a/sys/dev/bhnd/cores/pci/bhnd_pci_hostb.c b/sys/dev/bhnd/cores/pci/bhnd_pci_hostb.c index 0e2786f6af12..bf0e76a24513 100644 --- a/sys/dev/bhnd/cores/pci/bhnd_pci_hostb.c +++ b/sys/dev/bhnd/cores/pci/bhnd_pci_hostb.c @@ -655,7 +655,7 @@ static device_method_t bhnd_pci_hostb_methods[] = { DEFINE_CLASS_1(bhnd_hostb, bhnd_pci_hostb_driver, bhnd_pci_hostb_methods, sizeof(struct bhnd_pcihb_softc), bhnd_pci_driver); -DRIVER_MODULE(bhnd_pci_hostb, bhnd, bhnd_pci_hostb_driver, bhnd_hostb_devclass, 0, 0); +DRIVER_MODULE(bhnd_pci_hostb, bhnd, bhnd_pci_hostb_driver, 0, 0); MODULE_VERSION(bhnd_pci_hostb, 1); MODULE_DEPEND(bhnd_pci_hostb, bhnd, 1, 1, 1); diff --git a/sys/dev/bhnd/cores/pci/bhnd_pcib.c b/sys/dev/bhnd/cores/pci/bhnd_pcib.c index 432414736f73..7f57099e067f 100644 --- a/sys/dev/bhnd/cores/pci/bhnd_pcib.c +++ b/sys/dev/bhnd/cores/pci/bhnd_pcib.c @@ -90,8 +90,7 @@ static device_method_t bhnd_pcib_methods[] = { DEFINE_CLASS_1(pcib, bhnd_pcib_driver, bhnd_pcib_methods, sizeof(struct bhnd_pcib_softc), bhnd_pci_driver); -static devclass_t pcib_devclass; -DRIVER_MODULE(bhnd_pcib, bhnd, bhnd_pcib_driver, pcib_devclass, 0, 0); +DRIVER_MODULE(bhnd_pcib, bhnd, bhnd_pcib_driver, 0, 0); MODULE_VERSION(bhnd_pcib, 1); MODULE_DEPEND(bhnd_pcib, bhnd, 1, 1, 1); diff --git a/sys/dev/bhnd/cores/pcie2/bhnd_pcie2_hostb.c b/sys/dev/bhnd/cores/pcie2/bhnd_pcie2_hostb.c index 0c8419d48fc6..b312077e56ce 100644 --- a/sys/dev/bhnd/cores/pcie2/bhnd_pcie2_hostb.c +++ b/sys/dev/bhnd/cores/pcie2/bhnd_pcie2_hostb.c @@ -240,7 +240,7 @@ DEFINE_CLASS_1(bhnd_hostb, bhnd_pcie2_hostb_driver, bhnd_pcie2_hostb_methods, sizeof(struct bhnd_pcie2hb_softc), bhnd_pcie2_driver); -DRIVER_MODULE(bhnd_pcie2_hostb, bhnd, bhnd_pcie2_hostb_driver, bhnd_hostb_devclass, 0, 0); +DRIVER_MODULE(bhnd_pcie2_hostb, bhnd, bhnd_pcie2_hostb_driver, 0, 0); MODULE_VERSION(bhnd_pcie2_hostb, 1); MODULE_DEPEND(bhnd_pcie2_hostb, bhnd, 1, 1, 1); diff --git a/sys/dev/bhnd/cores/pcie2/bhnd_pcie2b.c b/sys/dev/bhnd/cores/pcie2/bhnd_pcie2b.c index 807d1740985f..618ada0d1966 100644 --- a/sys/dev/bhnd/cores/pcie2/bhnd_pcie2b.c +++ b/sys/dev/bhnd/cores/pcie2/bhnd_pcie2b.c @@ -91,8 +91,7 @@ static device_method_t bhnd_pcie2b_methods[] = { DEFINE_CLASS_1(pcib, bhnd_pcie2b_driver, bhnd_pcie2b_methods, sizeof(struct bhnd_pcie2b_softc), bhnd_pcie2_driver); -static devclass_t pcib_devclass; -DRIVER_MODULE(bhnd_pcie2b, bhnd, bhnd_pcie2b_driver, pcib_devclass, 0, 0); +DRIVER_MODULE(bhnd_pcie2b, bhnd, bhnd_pcie2b_driver, 0, 0); MODULE_VERSION(bhnd_pcie2b, 1); MODULE_DEPEND(bhnd_pcie2b, bhnd, 1, 1, 1); diff --git a/sys/dev/bhnd/cores/pmu/bhnd_pmu.c b/sys/dev/bhnd/cores/pmu/bhnd_pmu.c index c3676ae08115..abe8b3ed50a5 100644 --- a/sys/dev/bhnd/cores/pmu/bhnd_pmu.c +++ b/sys/dev/bhnd/cores/pmu/bhnd_pmu.c @@ -71,8 +71,6 @@ __FBSDID("$FreeBSD$"); * offsets within the ChipCommon core. */ -devclass_t bhnd_pmu_devclass; /**< bhnd(4) PMU device class */ - static int bhnd_pmu_sysctl_bus_freq(SYSCTL_HANDLER_ARGS); static int bhnd_pmu_sysctl_cpu_freq(SYSCTL_HANDLER_ARGS); static int bhnd_pmu_sysctl_mem_freq(SYSCTL_HANDLER_ARGS); diff --git a/sys/dev/bhnd/cores/pmu/bhnd_pmu_core.c b/sys/dev/bhnd/cores/pmu/bhnd_pmu_core.c index 5a991d0cd942..f196aded6c90 100644 --- a/sys/dev/bhnd/cores/pmu/bhnd_pmu_core.c +++ b/sys/dev/bhnd/cores/pmu/bhnd_pmu_core.c @@ -141,8 +141,8 @@ static device_method_t bhnd_pmucore_methods[] = { DEFINE_CLASS_1(bhnd_pmu, bhnd_pmucore_driver, bhnd_pmucore_methods, sizeof(struct bhnd_pmu_softc), bhnd_pmu_driver); -EARLY_DRIVER_MODULE(bhnd_pmu, bhnd, bhnd_pmucore_driver, bhnd_pmu_devclass, - NULL, NULL, BUS_PASS_TIMER + BUS_PASS_ORDER_MIDDLE); +EARLY_DRIVER_MODULE(bhnd_pmu, bhnd, bhnd_pmucore_driver, NULL, NULL, + BUS_PASS_TIMER + BUS_PASS_ORDER_MIDDLE); MODULE_DEPEND(bhnd_pmu_core, bhnd_pmu, 1, 1, 1); MODULE_VERSION(bhnd_pmu_core, 1); diff --git a/sys/dev/bhnd/cores/pmu/bhnd_pmuvar.h b/sys/dev/bhnd/cores/pmu/bhnd_pmuvar.h index 1bc0ff729e18..4c408063d7ec 100644 --- a/sys/dev/bhnd/cores/pmu/bhnd_pmuvar.h +++ b/sys/dev/bhnd/cores/pmu/bhnd_pmuvar.h @@ -43,7 +43,6 @@ struct bhnd_pmu_query; struct bhnd_pmu_io; DECLARE_CLASS(bhnd_pmu_driver); -extern devclass_t bhnd_pmu_devclass; int bhnd_pmu_probe(device_t dev); int bhnd_pmu_attach(device_t dev, struct bhnd_resource *res); diff --git a/sys/dev/bhnd/cores/usb/bhnd_ehci.c b/sys/dev/bhnd/cores/usb/bhnd_ehci.c index e2cffddf8793..6ca3de71dd24 100644 --- a/sys/dev/bhnd/cores/usb/bhnd_ehci.c +++ b/sys/dev/bhnd/cores/usb/bhnd_ehci.c @@ -256,7 +256,5 @@ static driver_t ehci_driver = { sizeof(ehci_softc_t), }; -static devclass_t ehci_devclass; - -DRIVER_MODULE(ehci, bhnd_usb, ehci_driver, ehci_devclass, 0, 0); +DRIVER_MODULE(ehci, bhnd_usb, ehci_driver, 0, 0); MODULE_DEPEND(ehci, usb, 1, 1, 1); diff --git a/sys/dev/bhnd/cores/usb/bhnd_ohci.c b/sys/dev/bhnd/cores/usb/bhnd_ohci.c index 0308562e7ae6..07b12a19e176 100644 --- a/sys/dev/bhnd/cores/usb/bhnd_ohci.c +++ b/sys/dev/bhnd/cores/usb/bhnd_ohci.c @@ -218,7 +218,5 @@ static driver_t ohci_driver = { .size = sizeof(struct ohci_softc), }; -static devclass_t ohci_devclass; - -DRIVER_MODULE(ohci, bhnd_usb, ohci_driver, ohci_devclass, 0, 0); +DRIVER_MODULE(ohci, bhnd_usb, ohci_driver, 0, 0); MODULE_DEPEND(ohci, usb, 1, 1, 1); diff --git a/sys/dev/bhnd/cores/usb/bhnd_usb.c b/sys/dev/bhnd/cores/usb/bhnd_usb.c index 98f75d922460..a3471695a6aa 100644 --- a/sys/dev/bhnd/cores/usb/bhnd_usb.c +++ b/sys/dev/bhnd/cores/usb/bhnd_usb.c @@ -491,10 +491,8 @@ static device_method_t bhnd_usb_methods[] = { DEVMETHOD_END }; -static devclass_t bhnd_usb_devclass; - DEFINE_CLASS_0(bhnd_usb, bhnd_usb_driver, bhnd_usb_methods, sizeof(struct bhnd_usb_softc)); -DRIVER_MODULE(bhnd_usb, bhnd, bhnd_usb_driver, bhnd_usb_devclass, 0, 0); +DRIVER_MODULE(bhnd_usb, bhnd, bhnd_usb_driver, 0, 0); MODULE_VERSION(bhnd_usb, 1); diff --git a/sys/dev/bhnd/siba/siba_bhndb.c b/sys/dev/bhnd/siba/siba_bhndb.c index 5eb58c98e58b..4a0493366fe1 100644 --- a/sys/dev/bhnd/siba/siba_bhndb.c +++ b/sys/dev/bhnd/siba/siba_bhndb.c @@ -290,7 +290,7 @@ static device_method_t siba_bhndb_methods[] = { DEFINE_CLASS_2(bhnd, siba_bhndb_driver, siba_bhndb_methods, sizeof(struct siba_softc), bhnd_bhndb_driver, siba_driver); -DRIVER_MODULE(siba_bhndb, bhndb, siba_bhndb_driver, bhnd_devclass, NULL, NULL); +DRIVER_MODULE(siba_bhndb, bhndb, siba_bhndb_driver, NULL, NULL); MODULE_VERSION(siba_bhndb, 1); MODULE_DEPEND(siba_bhndb, siba, 1, 1, 1);