From d83185d932c6904bab7877136f610d01cf249d51 Mon Sep 17 00:00:00 2001
From: John Baldwin <jhb@FreeBSD.org>
Date: Mon, 9 May 2022 12:22:03 -0700
Subject: [PATCH] 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);