From nobody Mon May 9 19:22:35 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 2F4881AC04EA; Mon, 9 May 2022 19:22:37 +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 4KxrfN5Cg5z3nyT; Mon, 9 May 2022 19:22:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652124156; 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=XulVj5AmmEQHgLNFAb3EgL2WvKMr1OzJXAzSsz1X/xo=; b=MSHj62CG1KmEvi7QI9rtls/ju8ypk1e0FfBnStHCa7zYEP1DfjeO5fLrWnDdARjqZcmYe6 id9Lti0oVZxpHQfWmFEx/ej1brMjedct0zGdmHTZvWCyR549jaejFspFSRtUx6MJLDvuX2 eIrathHT1JegnItwLGmQPB6tIa3NFuyApUluNxpUC+aYZ0FHRciP50k3uwB2sNJ3B21UEx dia+Tsl1VT9u/7Tk8/FAX2oMr7wobrnKFgxWCP44g+KBjnUXVJpxHNi4TlKE1SmYneHJdE 3FL0Qk0cYgvNl/l88smF9QuuylLNxWogE0vNgvMXxEystU7phSOsZ49Rq+Xo7w== 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 060481701B; Mon, 9 May 2022 19:22:36 +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 249JMZUd085069; Mon, 9 May 2022 19:22:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 249JMZrC085068; Mon, 9 May 2022 19:22:35 GMT (envelope-from git) Date: Mon, 9 May 2022 19:22:35 GMT Message-Id: <202205091922.249JMZrC085068@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: b338e3ea3c5e - main - bwi/bwn: 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: b338e3ea3c5ee9da02881789c6f83daf8d571a78 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652124156; 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=XulVj5AmmEQHgLNFAb3EgL2WvKMr1OzJXAzSsz1X/xo=; b=uiJPA26l38WIRIdT5euwh/vJogB3YeRJX2kLqwdO+VlxDSdwm187NB1uVgZNAes74BQgHN Naq6hC4bRRB+nTifR6bDhdKJdfoPTa+FqqT0d+XQgAe49vgK+uSQV15tm+JWXAcfh0172v BjWQZ0GnNQwMvaBBP70gpMhnZTyw1Pc/J2VtYG13KCo2C1sPEJ5+oIMrg7D24j6xU8c6bU psMUInR85Zq2a367T9wS+J5PlZWdhGZXew25ENToRMkPQPmbZsnKIBTx2ZhIDp8wY7TUiw 9JMbrVku/WH+hZtMyFBY+WL00AsrSyVeOd1a1ZvUe5XDcB/TANf0rICqUPxiEA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652124156; a=rsa-sha256; cv=none; b=dF4eIt+cx8g9RFyHenAMs3kA43IQOLpRNcCHxdekQHFlTbuDO0vv/TvwRmUDWcTUXbtrBE JA4RE1exB36QfIxSqZL0iNsgJBMx5iotBUw1tGIK5vD29QjuqLRwHWNXOGXv/sQ9ZmmbwL OCtNWyEAHW7wpiYvza0FVcucJY3LvnpaNSzTht0l+ABBJSKADKAeOJinHXV3XflERjS/fP U0Uc2whqvaS00B6TnDg9ylW++W5F3RCrOokt16ENyC16oGJKSpt3EyJNOpJglKZHWo9PMP +iah46rmT5aJlZfxIAHHyNDLkZjTUJ7khMmTRc1dzwq8eAkM/QSTt4AMGwoZOA== 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=b338e3ea3c5ee9da02881789c6f83daf8d571a78 commit b338e3ea3c5ee9da02881789c6f83daf8d571a78 Author: John Baldwin AuthorDate: 2022-05-09 19:22:00 +0000 Commit: John Baldwin CommitDate: 2022-05-09 19:22:00 +0000 bwi/bwn: Remove unused devclass arguments to DRIVER_MODULE. --- sys/dev/bwi/if_bwi_pci.c | 5 +++-- sys/dev/bwn/if_bwn.c | 5 +++-- sys/dev/bwn/if_bwn_pci.c | 5 +---- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/sys/dev/bwi/if_bwi_pci.c b/sys/dev/bwi/if_bwi_pci.c index d82b7d4d60de..fa87d003f1b2 100644 --- a/sys/dev/bwi/if_bwi_pci.c +++ b/sys/dev/bwi/if_bwi_pci.c @@ -248,13 +248,14 @@ static device_method_t bwi_pci_methods[] = { DEVMETHOD(device_resume, bwi_pci_resume), { 0,0 } }; + static driver_t bwi_driver = { "bwi", bwi_pci_methods, sizeof (struct bwi_pci_softc) }; -static devclass_t bwi_devclass; -DRIVER_MODULE(bwi, pci, bwi_driver, bwi_devclass, 0, 0); + +DRIVER_MODULE(bwi, pci, bwi_driver, 0, 0); MODULE_PNP_INFO("U16:vendor;U16:device;D:#", pci, bwi, bwi_devices, nitems(bwi_devices) - 1); MODULE_DEPEND(bwi, wlan, 1, 1, 1); /* 802.11 media layer */ diff --git a/sys/dev/bwn/if_bwn.c b/sys/dev/bwn/if_bwn.c index 1dc38dbcae6c..b911ac137d82 100644 --- a/sys/dev/bwn/if_bwn.c +++ b/sys/dev/bwn/if_bwn.c @@ -7738,13 +7738,14 @@ static device_method_t bwn_methods[] = { DEVMETHOD(device_resume, bwn_resume), DEVMETHOD_END }; + static driver_t bwn_driver = { "bwn", bwn_methods, sizeof(struct bwn_softc) }; -static devclass_t bwn_devclass; -DRIVER_MODULE(bwn, bhnd, bwn_driver, bwn_devclass, 0, 0); + +DRIVER_MODULE(bwn, bhnd, bwn_driver, 0, 0); MODULE_DEPEND(bwn, bhnd, 1, 1, 1); MODULE_DEPEND(bwn, gpiobus, 1, 1, 1); MODULE_DEPEND(bwn, wlan, 1, 1, 1); /* 802.11 media layer */ diff --git a/sys/dev/bwn/if_bwn_pci.c b/sys/dev/bwn/if_bwn_pci.c index 63f3f78a18f1..09e3c95fd87b 100644 --- a/sys/dev/bwn/if_bwn_pci.c +++ b/sys/dev/bwn/if_bwn_pci.c @@ -287,12 +287,9 @@ static device_method_t bwn_pci_methods[] = { DEVMETHOD_END }; -static devclass_t bwn_pci_devclass; - DEFINE_CLASS_0(bwn_pci, bwn_pci_driver, bwn_pci_methods, sizeof(struct bwn_pci_softc)); -DRIVER_MODULE_ORDERED(bwn_pci, pci, bwn_pci_driver, bwn_pci_devclass, NULL, - NULL, SI_ORDER_ANY); +DRIVER_MODULE_ORDERED(bwn_pci, pci, bwn_pci_driver, NULL, NULL, SI_ORDER_ANY); MODULE_PNP_INFO("U16:vendor;U16:device;D:#", pci, bwn_siba, siba_devices, nitems(siba_devices) - 1); MODULE_PNP_INFO("U16:vendor;U16:device;D:#", pci, bwn_bcma,