From nobody Mon May 09 19:23:12 2022 X-Original-To: dev-commits-src-main@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 C5C601AC35FD; Mon, 9 May 2022 19:23:14 +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 4Kxrg46D9Zz3pM7; Mon, 9 May 2022 19:23:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652124192; 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=wXjmZyVRwnOsz0TEzbMTdoVFh/EBbBIxaNdOlb4qhVE=; b=Pm1lZvXllqPPdM7MA2SfeQIm8iN9QcZyF/W6ZdXClexj6qO1lDiJ+YlZbCKasmX86LOXgN vqMUQbP0Y3u8aqXWcM+WeZR5AuFaSXl8jx0OIrGFtR9pmnhDojvrgSmYK4QX2cWH2Cc1G5 FmH9Dv4yEs4T1DdFTJZ+QddFdHF/QAGLTSkq9/BGSdP3q4gsp9EddQjjiV9XiLE2l8JCm6 Sc5i8AHvG5vr20dUzPSkNMbde7k3Ov2gFFIMbD+1FaVtiTaut/Wuqkj1QOffcFHdrV+T8Q aWagDumz+J0t4gmuuzPTq2RVch2jWpWCO+Mu6pvfYt/pKhtSNzaUZeni/V50yQ== 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 B04DF16DA7; Mon, 9 May 2022 19:23:12 +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 249JNCOT085873; Mon, 9 May 2022 19:23:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 249JNCMI085872; Mon, 9 May 2022 19:23:12 GMT (envelope-from git) Date: Mon, 9 May 2022 19:23:12 GMT Message-Id: <202205091923.249JNCMI085872@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: d83185d932c6 - main - ng_ubt: Remove unused devclass arguments to DRIVER_MODULE. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: d83185d932c6904bab7877136f610d01cf249d51 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652124192; 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=wXjmZyVRwnOsz0TEzbMTdoVFh/EBbBIxaNdOlb4qhVE=; b=TclqwWpegcjdMPaSRkg3zNFCWNiNpfsE/VmsprpjjQbAZnsFaTemAjpt0HnvVDCHRvHp/m 6mqXtzGBMp+SNlXximdhnh7D7saEE/HRYsQP3u/IMLjo7xXM5SoujSHz3Q5MvzxJckOx0+ wvQTzr1LO36apqOlpWU2Hj4Ppta2gbE+nxT9ju9QkBTv+UzqWsMn8aQEWvcP01KNSKjbCo JKCRYZ9hCq/eY7822n9TucCCDhyXJJfAX+TfQ9FW5ua7CJD3T4w1xcf+0YtIC3Hca41fYT cieohaPowywpV9E+dRRofWFe0zzqXL2L4BiVYZFKZqZ9DnZ4dctLuq5EpFyGQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652124192; a=rsa-sha256; cv=none; b=tFZEapZ1iJ0pMCIXqNp92mL1fA+JJ16sc7/CD1LRrzCxJUwNX6A4Kv8+t9j6hOY6tNd2Ld zyBJrxwIh2KmiQpD0u75pcYZmZK/Q+IBNX9ZTK0SVVOMc17RDn97blSwRwPhTPQMy6ZrlB ATAWaD7QzBr24VWffsDgm4kZPT+9bDg5VJE/sXIzDRyn8ciUMQ3NLc8y731qm4+hPoqXhp SeSqCsRoUyltCPriJHQIfgWzJGB3SiaW22ViEv4ngm+F1r7KJ28SLxeveXNmR96XNCM2Lc CLt9A/prSNeobnqvLNpQICsKVdlphplMbHd46C/5DfGfskYGKh70KE5TVNy9Hg== 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=d83185d932c6904bab7877136f610d01cf249d51 commit d83185d932c6904bab7877136f610d01cf249d51 Author: John Baldwin AuthorDate: 2022-05-09 19:22:03 +0000 Commit: John Baldwin CommitDate: 2022-05-09 19:22:03 +0000 ng_ubt: Remove unused devclass arguments to DRIVER_MODULE. --- sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c | 4 +--- sys/netgraph/bluetooth/drivers/ubt/ng_ubt_intel.c | 2 +- sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h | 1 - sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c | 4 +--- 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c index dee829336331..d1c2b3a83072 100644 --- a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c +++ b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c @@ -1992,8 +1992,6 @@ ubt_modevent(module_t mod, int event, void *data) return (error); } /* ubt_modevent */ -devclass_t ubt_devclass; - static device_method_t ubt_methods[] = { DEVMETHOD(device_probe, ubt_probe), @@ -2009,7 +2007,7 @@ driver_t ubt_driver = .size = sizeof(struct ubt_softc), }; -DRIVER_MODULE(ng_ubt, uhub, ubt_driver, ubt_devclass, ubt_modevent, 0); +DRIVER_MODULE(ng_ubt, uhub, ubt_driver, ubt_modevent, 0); MODULE_VERSION(ng_ubt, NG_BLUETOOTH_VERSION); MODULE_DEPEND(ng_ubt, netgraph, NG_ABI_VERSION, NG_ABI_VERSION, NG_ABI_VERSION); MODULE_DEPEND(ng_ubt, ng_hci, NG_BLUETOOTH_VERSION, NG_BLUETOOTH_VERSION, NG_BLUETOOTH_VERSION); diff --git a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_intel.c b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_intel.c index 978aeb924db6..21931ebe1bc9 100644 --- a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_intel.c +++ b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_intel.c @@ -215,7 +215,7 @@ static device_method_t ubt_intel_methods[] = DEFINE_CLASS_1(ubt, ubt_intel_driver, ubt_intel_methods, sizeof(struct ubt_softc), ubt_driver); -DRIVER_MODULE(ng_ubt_intel, uhub, ubt_intel_driver, ubt_devclass, 0, 0); +DRIVER_MODULE(ng_ubt_intel, uhub, ubt_intel_driver, 0, 0); MODULE_VERSION(ng_ubt_intel, NG_BLUETOOTH_VERSION); MODULE_DEPEND(ng_ubt_intel, netgraph, NG_ABI_VERSION, NG_ABI_VERSION, NG_ABI_VERSION); MODULE_DEPEND(ng_ubt_intel, ng_hci, NG_BLUETOOTH_VERSION, NG_BLUETOOTH_VERSION, NG_BLUETOOTH_VERSION); diff --git a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h index c2bd75c7faf0..0c369155dbdc 100644 --- a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h +++ b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h @@ -165,7 +165,6 @@ typedef struct ubt_softc * ubt_softc_p; usb_error_t ubt_do_hci_request(struct usb_device *, struct ubt_hci_cmd *, void *, usb_timeout_t); -extern devclass_t ubt_devclass; extern driver_t ubt_driver; #endif /* ndef _NG_UBT_VAR_H_ */ diff --git a/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c b/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c index 60896597cae7..ff6bab217988 100644 --- a/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c +++ b/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c @@ -155,8 +155,6 @@ static const struct usb_config ubtbcmfw_config[UBTBCMFW_N_TRANSFER] = * Module */ -static devclass_t ubtbcmfw_devclass; - static device_method_t ubtbcmfw_methods[] = { DEVMETHOD(device_probe, ubtbcmfw_probe), @@ -177,7 +175,7 @@ static const STRUCT_USB_HOST_ID ubtbcmfw_devs[] = { { USB_VPI(USB_VENDOR_BROADCOM, USB_PRODUCT_BROADCOM_BCM2033, 0) }, }; -DRIVER_MODULE(ubtbcmfw, uhub, ubtbcmfw_driver, ubtbcmfw_devclass, NULL, 0); +DRIVER_MODULE(ubtbcmfw, uhub, ubtbcmfw_driver, NULL, NULL); MODULE_DEPEND(ubtbcmfw, usb, 1, 1, 1); USB_PNP_HOST_INFO(ubtbcmfw_devs);