Expand USB_MATCH_START

29 files changed, 29 insertions, 29 deletions

diff --git a/sys/dev/usb/if_aue.c b/sys/dev/usb/if_aue.c
index 0cfd53a95d12..772eea690d51 100644
--- a/sys/dev/usb/if_aue.c
+++ b/sys/dev/usb/if_aue.c
@@ -615,7 +615,7 @@ aue_reset(struct aue_softc *sc)
 static int
 aue_match(device_t self)
 {
-	USB_MATCH_START(aue, uaa);
+	struct usb_attach_arg *uaa = device_get_ivars(self);
 
 	if (uaa->iface != NULL)
 		return (UMATCH_NONE);
diff --git a/sys/dev/usb/if_axe.c b/sys/dev/usb/if_axe.c
index 32e609984d6d..4c2c1b9ed2c9 100644
--- a/sys/dev/usb/if_axe.c
+++ b/sys/dev/usb/if_axe.c
@@ -382,7 +382,7 @@ axe_reset(struct axe_softc *sc)
 static int
 axe_match(device_t self)
 {
-	USB_MATCH_START(axe, uaa);
+	struct usb_attach_arg *uaa = device_get_ivars(self);
 	struct axe_type			*t;
 
 	if (!uaa->iface)
diff --git a/sys/dev/usb/if_cdce.c b/sys/dev/usb/if_cdce.c
index ef8101dc7780..156b2db3c3ca 100644
--- a/sys/dev/usb/if_cdce.c
+++ b/sys/dev/usb/if_cdce.c
@@ -111,7 +111,7 @@ static const struct cdce_type cdce_devs[] = {
 static int
 cdce_match(device_t self)
 {
-	USB_MATCH_START(cdce, uaa);
+	struct usb_attach_arg *uaa = device_get_ivars(self);
 	usb_interface_descriptor_t *id;
 
 	if (uaa->iface == NULL)
diff --git a/sys/dev/usb/if_cue.c b/sys/dev/usb/if_cue.c
index 7385a5dfd124..af62072c3323 100644
--- a/sys/dev/usb/if_cue.c
+++ b/sys/dev/usb/if_cue.c
@@ -407,7 +407,7 @@ cue_reset(struct cue_softc *sc)
 static int
 cue_match(device_t self)
 {
-	USB_MATCH_START(cue, uaa);
+	struct usb_attach_arg *uaa = device_get_ivars(self);
 	struct cue_type			*t;
 
 	if (!uaa->iface)
diff --git a/sys/dev/usb/if_kue.c b/sys/dev/usb/if_kue.c
index 8cae085981b3..771022591918 100644
--- a/sys/dev/usb/if_kue.c
+++ b/sys/dev/usb/if_kue.c
@@ -380,7 +380,7 @@ kue_reset(struct kue_softc *sc)
 static int
 kue_match(device_t self)
 {
-	USB_MATCH_START(kue, uaa);
+	struct usb_attach_arg *uaa = device_get_ivars(self);
 	struct kue_type			*t;
 
 	if (!uaa->iface)
diff --git a/sys/dev/usb/if_rue.c b/sys/dev/usb/if_rue.c
index c2c8dd55dc9c..d9f54c54004c 100644
--- a/sys/dev/usb/if_rue.c
+++ b/sys/dev/usb/if_rue.c
@@ -550,7 +550,7 @@ rue_reset(struct rue_softc *sc)
 static int
 rue_match(device_t self)
 {
-	USB_MATCH_START(rue, uaa);
+	struct usb_attach_arg *uaa = device_get_ivars(self);
 	struct rue_type	*t;
 
 	if (uaa->iface == NULL)
diff --git a/sys/dev/usb/if_rum.c b/sys/dev/usb/if_rum.c
index f8161df147af..21b589d27a37 100644
--- a/sys/dev/usb/if_rum.c
+++ b/sys/dev/usb/if_rum.c
@@ -362,7 +362,7 @@ USB_DECLARE_DRIVER(rum);
 static int
 rum_match(device_t self)
 {
-	USB_MATCH_START(rum, uaa);
+	struct usb_attach_arg *uaa = device_get_ivars(self);
 
 	if (uaa->iface != NULL)
 		return UMATCH_NONE;
diff --git a/sys/dev/usb/if_udav.c b/sys/dev/usb/if_udav.c
index 28059ad51a0a..457b04d5c75c 100644
--- a/sys/dev/usb/if_udav.c
+++ b/sys/dev/usb/if_udav.c
@@ -267,7 +267,7 @@ static const struct udav_type {
 static int
 udav_match(device_t self)
 {
-	USB_MATCH_START(udav, uaa);
+	struct usb_attach_arg *uaa = device_get_ivars(self);
 
 	if (uaa->iface != NULL)
 		return (UMATCH_NONE);
diff --git a/sys/dev/usb/if_ural.c b/sys/dev/usb/if_ural.c
index 5e28ac722f97..61bf44bd808d 100644
--- a/sys/dev/usb/if_ural.c
+++ b/sys/dev/usb/if_ural.c
@@ -349,7 +349,7 @@ USB_DECLARE_DRIVER(ural);
 static int
 ural_match(device_t self)
 {
-	USB_MATCH_START(ural, uaa);
+	struct usb_attach_arg *uaa = device_get_ivars(self);
 
 	if (uaa->iface != NULL)
 		return UMATCH_NONE;
diff --git a/sys/dev/usb/ubsa.c b/sys/dev/usb/ubsa.c
index a7e8ee553b7a..26b37ba09af8 100644
--- a/sys/dev/usb/ubsa.c
+++ b/sys/dev/usb/ubsa.c
@@ -261,7 +261,7 @@ MODULE_VERSION(ubsa, UBSA_MODVER);
 static int
 ubsa_match(device_t self)
 {
-	USB_MATCH_START(ubsa, uaa);
+	struct usb_attach_arg *uaa = device_get_ivars(self);
 	int i;
 
 	if (uaa->iface != NULL)
diff --git a/sys/dev/usb/ubser.c b/sys/dev/usb/ubser.c
index 934a271fac88..a2c1dae59a90 100644
--- a/sys/dev/usb/ubser.c
+++ b/sys/dev/usb/ubser.c
@@ -182,7 +182,7 @@ USB_DECLARE_DRIVER(ubser);
 static int
 ubser_match(device_t self)
 {
-	USB_MATCH_START(ubser, uaa);
+	struct usb_attach_arg *uaa = device_get_ivars(self);
 	usb_string_descriptor_t us;
 	usb_interface_descriptor_t *id;
 	usb_device_descriptor_t *dd;
diff --git a/sys/dev/usb/udbp.c b/sys/dev/usb/udbp.c
index cb40f1dc3251..32be0e859506 100644
--- a/sys/dev/usb/udbp.c
+++ b/sys/dev/usb/udbp.c
@@ -219,7 +219,7 @@ USB_DECLARE_DRIVER(udbp);
 static int
 udbp_match(device_t self)
 {
-	USB_MATCH_START(udbp, uaa);
+	struct usb_attach_arg *uaa = device_get_ivars(self);
 	usb_interface_descriptor_t *id;
 	if (!uaa->iface)
 	  return (UMATCH_NONE);
diff --git a/sys/dev/usb/ufm.c b/sys/dev/usb/ufm.c
index 0c7c89cc2686..ad7dc20bdbc4 100644
--- a/sys/dev/usb/ufm.c
+++ b/sys/dev/usb/ufm.c
@@ -103,7 +103,7 @@ USB_DECLARE_DRIVER(ufm);
 static int
 ufm_match(device_t self)
 {
-	USB_MATCH_START(ufm, uaa);
+	struct usb_attach_arg *uaa = device_get_ivars(self);
 	usb_device_descriptor_t *dd;
 
 	DPRINTFN(10,("ufm_match\n"));
diff --git a/sys/dev/usb/ufoma.c b/sys/dev/usb/ufoma.c
index 5960d3de47db..b9c1a176b787 100644
--- a/sys/dev/usb/ufoma.c
+++ b/sys/dev/usb/ufoma.c
@@ -263,7 +263,7 @@ MODULE_DEPEND(ufoma, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER);
 static int
 ufoma_match(device_t self)
 {
-	USB_MATCH_START(ufoma, uaa);
+	struct usb_attach_arg *uaa = device_get_ivars(self);
 	usb_interface_descriptor_t *id;
 	usb_config_descriptor_t *cd;
 	usb_mcpc_acm_descriptor *mad;
diff --git a/sys/dev/usb/uftdi.c b/sys/dev/usb/uftdi.c
index 1e1f1fb80d93..3ea0bb3685bf 100644
--- a/sys/dev/usb/uftdi.c
+++ b/sys/dev/usb/uftdi.c
@@ -136,7 +136,7 @@ struct ucom_callback uftdi_callback = {
 static int
 uftdi_match(device_t self)
 {
-	USB_MATCH_START(uftdi, uaa);
+	struct usb_attach_arg *uaa = device_get_ivars(self);
 
 	if (uaa->iface != NULL) {
 		if (uaa->vendor == USB_VENDOR_FTDI &&
diff --git a/sys/dev/usb/uhid.c b/sys/dev/usb/uhid.c
index ae39540ab2a9..8f484ad612e6 100644
--- a/sys/dev/usb/uhid.c
+++ b/sys/dev/usb/uhid.c
@@ -168,7 +168,7 @@ USB_DECLARE_DRIVER(uhid);
 static int
 uhid_match(device_t self)
 {
-	USB_MATCH_START(uhid, uaa);
+	struct usb_attach_arg *uaa = device_get_ivars(self);
 	usb_interface_descriptor_t *id;
 
 	if (uaa->iface == NULL)
diff --git a/sys/dev/usb/uhub.c b/sys/dev/usb/uhub.c
index 769dd6f10a3f..8941bd515795 100644
--- a/sys/dev/usb/uhub.c
+++ b/sys/dev/usb/uhub.c
@@ -139,7 +139,7 @@ static	driver_t uhubroot_driver = {
 static int
 uhub_match(device_t self)
 {
-	USB_MATCH_START(uhub, uaa);
+	struct usb_attach_arg *uaa = device_get_ivars(self);
 	usb_device_descriptor_t *dd = usbd_get_device_descriptor(uaa->device);
 
 	DPRINTFN(5,("uhub_match, dd=%p\n", dd));
diff --git a/sys/dev/usb/uipaq.c b/sys/dev/usb/uipaq.c
index 2645eef5d50f..0128c1ce939a 100644
--- a/sys/dev/usb/uipaq.c
+++ b/sys/dev/usb/uipaq.c
@@ -132,7 +132,7 @@ static const struct uipaq_type uipaq_devs[] = {
 static int
 uipaq_match(device_t self)
 {
-	USB_MATCH_START(uipaq, uaa);
+	struct usb_attach_arg *uaa = device_get_ivars(self);
 
 	if (uaa->iface != NULL)
 		return (UMATCH_NONE);
diff --git a/sys/dev/usb/ukbd.c b/sys/dev/usb/ukbd.c
index 0d991e824833..d956e6637d84 100644
--- a/sys/dev/usb/ukbd.c
+++ b/sys/dev/usb/ukbd.c
@@ -127,7 +127,7 @@ USB_DECLARE_DRIVER_INIT(ukbd, DEVMETHOD(device_resume, ukbd_resume));
 static int
 ukbd_match(device_t self)
 {
-	USB_MATCH_START(ukbd, uaa);
+	struct usb_attach_arg *uaa = device_get_ivars(self);
 
 	keyboard_switch_t *sw;
 	void *arg[2];
diff --git a/sys/dev/usb/ulpt.c b/sys/dev/usb/ulpt.c
index 446dd25c87ca..66699fe91ee9 100644
--- a/sys/dev/usb/ulpt.c
+++ b/sys/dev/usb/ulpt.c
@@ -170,7 +170,7 @@ USB_DECLARE_DRIVER(ulpt);
 static int
 ulpt_match(device_t self)
 {
-	USB_MATCH_START(ulpt, uaa);
+	struct usb_attach_arg *uaa = device_get_ivars(self);
 	usb_interface_descriptor_t *id;
 
 	DPRINTFN(10,("ulpt_match\n"));
diff --git a/sys/dev/usb/umass.c b/sys/dev/usb/umass.c
index a114711e5559..45a6fb2c5343 100644
--- a/sys/dev/usb/umass.c
+++ b/sys/dev/usb/umass.c
@@ -911,7 +911,7 @@ umass_match_proto(struct umass_softc *sc, usbd_interface_handle iface,
 static int
 umass_match(device_t self)
 {
-	USB_MATCH_START(umass, uaa);
+	struct usb_attach_arg *uaa = device_get_ivars(self);
 	struct umass_softc *sc = device_get_softc(self);
 
 	sc->sc_dev = self;
diff --git a/sys/dev/usb/umct.c b/sys/dev/usb/umct.c
index 9d890954ed41..2f9d5fe3bd54 100644
--- a/sys/dev/usb/umct.c
+++ b/sys/dev/usb/umct.c
@@ -141,7 +141,7 @@ MODULE_VERSION(umct, 1);
 static int
 umct_match(device_t self)
 {
-	USB_MATCH_START(umct, uaa);
+	struct usb_attach_arg *uaa = device_get_ivars(self);
 	int i;
 
 	if (uaa->iface != NULL)
diff --git a/sys/dev/usb/umodem.c b/sys/dev/usb/umodem.c
index b1ee0d6d0e94..f9adce39712b 100644
--- a/sys/dev/usb/umodem.c
+++ b/sys/dev/usb/umodem.c
@@ -230,7 +230,7 @@ MODULE_VERSION(umodem, UMODEM_MODVER);
 static int
 umodem_match(device_t self)
 {
-	USB_MATCH_START(umodem, uaa);
+	struct usb_attach_arg *uaa = device_get_ivars(self);
 	usb_interface_descriptor_t *id;
 	usb_device_descriptor_t *dd;
 	int cm, acm, i, ret;
diff --git a/sys/dev/usb/ums.c b/sys/dev/usb/ums.c
index b81644598b00..c39b0332124f 100644
--- a/sys/dev/usb/ums.c
+++ b/sys/dev/usb/ums.c
@@ -162,7 +162,7 @@ USB_DECLARE_DRIVER(ums);
 static int
 ums_match(device_t self)
 {
-	USB_MATCH_START(ums, uaa);
+	struct usb_attach_arg *uaa = device_get_ivars(self);
 	usb_interface_descriptor_t *id;
 	int size, ret;
 	void *desc;
diff --git a/sys/dev/usb/uplcom.c b/sys/dev/usb/uplcom.c
index 5a564e617a9f..3082a232c386 100644
--- a/sys/dev/usb/uplcom.c
+++ b/sys/dev/usb/uplcom.c
@@ -321,7 +321,7 @@ SYSCTL_PROC(_hw_usb_uplcom, OID_AUTO, interval, CTLTYPE_INT | CTLFLAG_RW,
 static int
 uplcom_match(device_t self)
 {
-	USB_MATCH_START(uplcom, uaa);
+	struct usb_attach_arg *uaa = device_get_ivars(self);
 	int i;
 
 	if (uaa->iface != NULL)
diff --git a/sys/dev/usb/urio.c b/sys/dev/usb/urio.c
index b99d4005558e..046e847372a2 100644
--- a/sys/dev/usb/urio.c
+++ b/sys/dev/usb/urio.c
@@ -137,7 +137,7 @@ USB_DECLARE_DRIVER(urio);
 static int
 urio_match(device_t self)
 {
-	USB_MATCH_START(urio, uaa);
+	struct usb_attach_arg *uaa = device_get_ivars(self);
 	usb_device_descriptor_t *dd;
 
 	DPRINTFN(10,("urio_match\n"));
diff --git a/sys/dev/usb/uscanner.c b/sys/dev/usb/uscanner.c
index 4073ec6faabe..652cf264bcd3 100644
--- a/sys/dev/usb/uscanner.c
+++ b/sys/dev/usb/uscanner.c
@@ -293,7 +293,7 @@ USB_DECLARE_DRIVER(uscanner);
 static int
 uscanner_match(device_t self)
 {
-	USB_MATCH_START(uscanner, uaa);
+	struct usb_attach_arg *uaa = device_get_ivars(self);
 
 	if (uaa->iface != NULL)
 		return UMATCH_NONE;
diff --git a/sys/dev/usb/uvisor.c b/sys/dev/usb/uvisor.c
index dbcb315a7afb..d2cd099ae066 100644
--- a/sys/dev/usb/uvisor.c
+++ b/sys/dev/usb/uvisor.c
@@ -247,7 +247,7 @@ static const struct uvisor_type uvisor_devs[] = {
 static int
 uvisor_match(device_t self)
 {
-	USB_MATCH_START(uvisor, uaa);
+	struct usb_attach_arg *uaa = device_get_ivars(self);
 
 	if (uaa->iface != NULL)
 		return (UMATCH_NONE);
diff --git a/sys/dev/usb/uvscom.c b/sys/dev/usb/uvscom.c
index 97ced912d4c1..8612d424a7ac 100644
--- a/sys/dev/usb/uvscom.c
+++ b/sys/dev/usb/uvscom.c
@@ -297,7 +297,7 @@ SYSCTL_PROC(_hw_usb_uvscom, OID_AUTO, interval, CTLTYPE_INT | CTLFLAG_RW,
 static int
 uvscom_match(device_t self)
 {
-	USB_MATCH_START(uvscom, uaa);
+	struct usb_attach_arg *uaa = device_get_ivars(self);
 
 	if (uaa->iface != NULL)
 		return (UMATCH_NONE);