Use DEVMETHOD_END.

32 files changed, 33 insertions, 36 deletions

diff --git a/sys/dev/dc/dcphy.c b/sys/dev/dc/dcphy.c
index ab44993..a05f2ed 100644
--- a/sys/dev/dc/dcphy.c
+++ b/sys/dev/dc/dcphy.c
@@ -95,7 +95,7 @@ static device_method_t dcphy_methods[] = {
 	DEVMETHOD(device_attach,	dcphy_attach),
 	DEVMETHOD(device_detach,	mii_phy_detach),
 	DEVMETHOD(device_shutdown,	bus_generic_shutdown),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static devclass_t dcphy_devclass;
diff --git a/sys/dev/dc/pnphy.c b/sys/dev/dc/pnphy.c
index 6546acd..98e721d 100644
--- a/sys/dev/dc/pnphy.c
+++ b/sys/dev/dc/pnphy.c
@@ -74,7 +74,7 @@ static device_method_t pnphy_methods[] = {
 	DEVMETHOD(device_attach,	pnphy_attach),
 	DEVMETHOD(device_detach,	mii_phy_detach),
 	DEVMETHOD(device_shutdown,	bus_generic_shutdown),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static devclass_t pnphy_devclass;
diff --git a/sys/dev/mii/acphy.c b/sys/dev/mii/acphy.c
index 58e546e..c61c05b 100644
--- a/sys/dev/mii/acphy.c
+++ b/sys/dev/mii/acphy.c
@@ -87,7 +87,7 @@ static device_method_t acphy_methods[] = {
 	DEVMETHOD(device_attach,	acphy_attach),
 	DEVMETHOD(device_detach,	mii_phy_detach),
 	DEVMETHOD(device_shutdown,	bus_generic_shutdown),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static devclass_t acphy_devclass;
diff --git a/sys/dev/mii/amphy.c b/sys/dev/mii/amphy.c
index c5f5f5c..bd90ccf 100644
--- a/sys/dev/mii/amphy.c
+++ b/sys/dev/mii/amphy.c
@@ -66,7 +66,7 @@ static device_method_t amphy_methods[] = {
 	DEVMETHOD(device_attach,	amphy_attach),
 	DEVMETHOD(device_detach,	mii_phy_detach),
 	DEVMETHOD(device_shutdown,	bus_generic_shutdown),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static devclass_t amphy_devclass;
diff --git a/sys/dev/mii/atphy.c b/sys/dev/mii/atphy.c
index b5cf14f..cca8813 100644
--- a/sys/dev/mii/atphy.c
+++ b/sys/dev/mii/atphy.c
@@ -59,7 +59,7 @@ static device_method_t atphy_methods[] = {
 	DEVMETHOD(device_attach,	atphy_attach),
 	DEVMETHOD(device_detach,	mii_phy_detach),
 	DEVMETHOD(device_shutdown,	bus_generic_shutdown),
-	{ NULL, NULL }
+	DEVMETHOD_END
 };
 
 static devclass_t atphy_devclass;
diff --git a/sys/dev/mii/axphy.c b/sys/dev/mii/axphy.c
index 7e83f4b..78f3901 100644
--- a/sys/dev/mii/axphy.c
+++ b/sys/dev/mii/axphy.c
@@ -56,7 +56,7 @@ static device_method_t axphy_methods[] = {
 	DEVMETHOD(device_attach,	axphy_attach),
 	DEVMETHOD(device_detach,	mii_phy_detach),
 	DEVMETHOD(device_shutdown,	bus_generic_shutdown),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static devclass_t axphy_devclass;
diff --git a/sys/dev/mii/bmtphy.c b/sys/dev/mii/bmtphy.c
index 84933b7..81c2bd2 100644
--- a/sys/dev/mii/bmtphy.c
+++ b/sys/dev/mii/bmtphy.c
@@ -91,8 +91,7 @@ static device_method_t bmtphy_methods[] = {
 	DEVMETHOD(device_attach,	bmtphy_attach),
 	DEVMETHOD(device_detach,	mii_phy_detach),
 	DEVMETHOD(device_shutdown,	bus_generic_shutdown),
-
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static devclass_t	bmtphy_devclass;
diff --git a/sys/dev/mii/brgphy.c b/sys/dev/mii/brgphy.c
index d852e80..516676e 100644
--- a/sys/dev/mii/brgphy.c
+++ b/sys/dev/mii/brgphy.c
@@ -82,7 +82,7 @@ static device_method_t brgphy_methods[] = {
 	DEVMETHOD(device_attach,	brgphy_attach),
 	DEVMETHOD(device_detach,	mii_phy_detach),
 	DEVMETHOD(device_shutdown,	bus_generic_shutdown),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static devclass_t brgphy_devclass;
diff --git a/sys/dev/mii/ciphy.c b/sys/dev/mii/ciphy.c
index 2133c76..87d0d81 100644
--- a/sys/dev/mii/ciphy.c
+++ b/sys/dev/mii/ciphy.c
@@ -67,7 +67,7 @@ static device_method_t ciphy_methods[] = {
 	DEVMETHOD(device_attach,	ciphy_attach),
 	DEVMETHOD(device_detach,	mii_phy_detach),
 	DEVMETHOD(device_shutdown,	bus_generic_shutdown),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static devclass_t ciphy_devclass;
diff --git a/sys/dev/mii/e1000phy.c b/sys/dev/mii/e1000phy.c
index e657592..91ae44d 100644
--- a/sys/dev/mii/e1000phy.c
+++ b/sys/dev/mii/e1000phy.c
@@ -71,7 +71,7 @@ static device_method_t e1000phy_methods[] = {
 	DEVMETHOD(device_attach,	e1000phy_attach),
 	DEVMETHOD(device_detach,	mii_phy_detach),
 	DEVMETHOD(device_shutdown,	bus_generic_shutdown),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static devclass_t e1000phy_devclass;
diff --git a/sys/dev/mii/gentbi.c b/sys/dev/mii/gentbi.c
index bf5319b..05209cf 100644
--- a/sys/dev/mii/gentbi.c
+++ b/sys/dev/mii/gentbi.c
@@ -95,7 +95,7 @@ static device_method_t gentbi_methods[] = {
 	DEVMETHOD(device_attach,	gentbi_attach),
 	DEVMETHOD(device_detach,	mii_phy_detach),
 	DEVMETHOD(device_shutdown,	bus_generic_shutdown),
-	{0, 0}
+	DEVMETHOD_END
 };
 
 static devclass_t gentbi_devclass;
diff --git a/sys/dev/mii/icsphy.c b/sys/dev/mii/icsphy.c
index 90ec374..6330d9e 100644
--- a/sys/dev/mii/icsphy.c
+++ b/sys/dev/mii/icsphy.c
@@ -89,7 +89,7 @@ static device_method_t icsphy_methods[] = {
 	DEVMETHOD(device_attach,	icsphy_attach),
 	DEVMETHOD(device_detach,	mii_phy_detach),
 	DEVMETHOD(device_shutdown,	bus_generic_shutdown),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static devclass_t icsphy_devclass;
diff --git a/sys/dev/mii/ip1000phy.c b/sys/dev/mii/ip1000phy.c
index 9634f84..b7fb515 100644
--- a/sys/dev/mii/ip1000phy.c
+++ b/sys/dev/mii/ip1000phy.c
@@ -63,7 +63,7 @@ static device_method_t ip1000phy_methods[] = {
 	DEVMETHOD(device_attach,	ip1000phy_attach),
 	DEVMETHOD(device_detach,	mii_phy_detach),
 	DEVMETHOD(device_shutdown,	bus_generic_shutdown),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static devclass_t ip1000phy_devclass;
diff --git a/sys/dev/mii/jmphy.c b/sys/dev/mii/jmphy.c
index 1e3eb55..14fdf7e 100644
--- a/sys/dev/mii/jmphy.c
+++ b/sys/dev/mii/jmphy.c
@@ -62,7 +62,7 @@ static device_method_t jmphy_methods[] = {
 	DEVMETHOD(device_attach,	jmphy_attach),
 	DEVMETHOD(device_detach,	mii_phy_detach),
 	DEVMETHOD(device_shutdown,	bus_generic_shutdown),
-	{ NULL, NULL }
+	DEVMETHOD_END
 };
 
 static devclass_t jmphy_devclass;
diff --git a/sys/dev/mii/lxtphy.c b/sys/dev/mii/lxtphy.c
index f223ec6..d7059fb 100644
--- a/sys/dev/mii/lxtphy.c
+++ b/sys/dev/mii/lxtphy.c
@@ -91,7 +91,7 @@ static device_method_t lxtphy_methods[] = {
 	DEVMETHOD(device_attach,	lxtphy_attach),
 	DEVMETHOD(device_detach,	mii_phy_detach),
 	DEVMETHOD(device_shutdown,	bus_generic_shutdown),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static devclass_t lxtphy_devclass;
diff --git a/sys/dev/mii/mlphy.c b/sys/dev/mii/mlphy.c
index 3708b4a..f9b1962 100644
--- a/sys/dev/mii/mlphy.c
+++ b/sys/dev/mii/mlphy.c
@@ -84,7 +84,7 @@ static device_method_t mlphy_methods[] = {
 	DEVMETHOD(device_attach,	mlphy_attach),
 	DEVMETHOD(device_detach,	mii_phy_detach),
 	DEVMETHOD(device_shutdown,	bus_generic_shutdown),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static devclass_t mlphy_devclass;
diff --git a/sys/dev/mii/nsgphy.c b/sys/dev/mii/nsgphy.c
index cd18acf..988e5c2 100644
--- a/sys/dev/mii/nsgphy.c
+++ b/sys/dev/mii/nsgphy.c
@@ -83,7 +83,7 @@ static device_method_t nsgphy_methods[] = {
 	DEVMETHOD(device_attach,	nsgphy_attach),
 	DEVMETHOD(device_detach,	mii_phy_detach),
 	DEVMETHOD(device_shutdown,	bus_generic_shutdown),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static devclass_t nsgphy_devclass;
diff --git a/sys/dev/mii/nsphy.c b/sys/dev/mii/nsphy.c
index 86a69b6..01cd31d 100644
--- a/sys/dev/mii/nsphy.c
+++ b/sys/dev/mii/nsphy.c
@@ -90,7 +90,7 @@ static device_method_t nsphy_methods[] = {
 	DEVMETHOD(device_attach,	nsphy_attach),
 	DEVMETHOD(device_detach,	mii_phy_detach),
 	DEVMETHOD(device_shutdown,	bus_generic_shutdown),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static devclass_t nsphy_devclass;
diff --git a/sys/dev/mii/nsphyter.c b/sys/dev/mii/nsphyter.c
index facdebb..316117d 100644
--- a/sys/dev/mii/nsphyter.c
+++ b/sys/dev/mii/nsphyter.c
@@ -93,7 +93,7 @@ static device_method_t nsphyter_methods[] = {
 	DEVMETHOD(device_attach,	nsphyter_attach),
 	DEVMETHOD(device_detach,	mii_phy_detach),
 	DEVMETHOD(device_shutdown,	bus_generic_shutdown),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static devclass_t nsphyter_devclass;
diff --git a/sys/dev/mii/pnaphy.c b/sys/dev/mii/pnaphy.c
index 0e77c4f..29f2c78 100644
--- a/sys/dev/mii/pnaphy.c
+++ b/sys/dev/mii/pnaphy.c
@@ -69,7 +69,7 @@ static device_method_t pnaphy_methods[] = {
 	DEVMETHOD(device_attach,	pnaphy_attach),
 	DEVMETHOD(device_detach,	mii_phy_detach),
 	DEVMETHOD(device_shutdown,	bus_generic_shutdown),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static devclass_t pnaphy_devclass;
diff --git a/sys/dev/mii/qsphy.c b/sys/dev/mii/qsphy.c
index a504504..a649e5c 100644
--- a/sys/dev/mii/qsphy.c
+++ b/sys/dev/mii/qsphy.c
@@ -91,7 +91,7 @@ static device_method_t qsphy_methods[] = {
 	DEVMETHOD(device_attach,	qsphy_attach),
 	DEVMETHOD(device_detach,	mii_phy_detach),
 	DEVMETHOD(device_shutdown,	bus_generic_shutdown),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static devclass_t qsphy_devclass;
diff --git a/sys/dev/mii/rgephy.c b/sys/dev/mii/rgephy.c
index 6d54542..d5dbbc8 100644
--- a/sys/dev/mii/rgephy.c
+++ b/sys/dev/mii/rgephy.c
@@ -68,7 +68,7 @@ static device_method_t rgephy_methods[] = {
 	DEVMETHOD(device_attach,	rgephy_attach),
 	DEVMETHOD(device_detach,	mii_phy_detach),
 	DEVMETHOD(device_shutdown,	bus_generic_shutdown),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static devclass_t rgephy_devclass;
diff --git a/sys/dev/mii/rlphy.c b/sys/dev/mii/rlphy.c
index b285f7f..ddf8d73 100644
--- a/sys/dev/mii/rlphy.c
+++ b/sys/dev/mii/rlphy.c
@@ -66,7 +66,7 @@ static device_method_t rlphy_methods[] = {
 	DEVMETHOD(device_attach,	rlphy_attach),
 	DEVMETHOD(device_detach,	mii_phy_detach),
 	DEVMETHOD(device_shutdown,	bus_generic_shutdown),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static devclass_t rlphy_devclass;
diff --git a/sys/dev/mii/rlswitch.c b/sys/dev/mii/rlswitch.c
index 67c4ec3..b158fd4 100644
--- a/sys/dev/mii/rlswitch.c
+++ b/sys/dev/mii/rlswitch.c
@@ -70,7 +70,7 @@ static device_method_t rlswitch_methods[] = {
 	DEVMETHOD(device_attach,	rlswitch_attach),
 	DEVMETHOD(device_detach,	mii_phy_detach),
 	DEVMETHOD(device_shutdown,	bus_generic_shutdown),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static devclass_t rlswitch_devclass;
diff --git a/sys/dev/mii/smcphy.c b/sys/dev/mii/smcphy.c
index b04a919..fbeaddf 100644
--- a/sys/dev/mii/smcphy.c
+++ b/sys/dev/mii/smcphy.c
@@ -62,8 +62,7 @@ static device_method_t smcphy_methods[] = {
 	DEVMETHOD(device_attach,	smcphy_attach),
 	DEVMETHOD(device_detach,	mii_phy_detach),
 	DEVMETHOD(device_shutdown,	bus_generic_shutdown),
-
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static devclass_t smcphy_devclass;
@@ -207,8 +206,7 @@ smcphy_auto(struct mii_softc *sc, int media)
 {
 	uint16_t	anar;
 
-	anar = BMSR_MEDIA_TO_ANAR(sc->mii_capabilities) |
-	    ANAR_CSMA;
+	anar = BMSR_MEDIA_TO_ANAR(sc->mii_capabilities) | ANAR_CSMA;
 	if ((media & IFM_FLOW) != 0 || (sc->mii_flags & MIIF_FORCEPAUSE) != 0)
 		anar |= ANAR_FC;
 	PHY_WRITE(sc, MII_ANAR, anar);
diff --git a/sys/dev/mii/tdkphy.c b/sys/dev/mii/tdkphy.c
index 83868ad..d07327c 100644
--- a/sys/dev/mii/tdkphy.c
+++ b/sys/dev/mii/tdkphy.c
@@ -71,7 +71,7 @@ static device_method_t tdkphy_methods[] = {
 	DEVMETHOD(device_attach,	tdkphy_attach),
 	DEVMETHOD(device_detach,	mii_phy_detach),
 	DEVMETHOD(device_shutdown,	bus_generic_shutdown),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static devclass_t tdkphy_devclass;
diff --git a/sys/dev/mii/tlphy.c b/sys/dev/mii/tlphy.c
index c99c754..ac5cff3 100644
--- a/sys/dev/mii/tlphy.c
+++ b/sys/dev/mii/tlphy.c
@@ -97,7 +97,7 @@ static device_method_t tlphy_methods[] = {
 	DEVMETHOD(device_attach,	tlphy_attach),
 	DEVMETHOD(device_detach,	mii_phy_detach),
 	DEVMETHOD(device_shutdown,	bus_generic_shutdown),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static devclass_t tlphy_devclass;
diff --git a/sys/dev/mii/truephy.c b/sys/dev/mii/truephy.c
index 86480f1..df17b24 100644
--- a/sys/dev/mii/truephy.c
+++ b/sys/dev/mii/truephy.c
@@ -72,7 +72,7 @@ static device_method_t truephy_methods[] = {
 	DEVMETHOD(device_attach,	truephy_attach),
 	DEVMETHOD(device_detach,	mii_phy_detach),
 	DEVMETHOD(device_shutdown,	bus_generic_shutdown),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static const struct mii_phydesc truephys[] = {
diff --git a/sys/dev/mii/ukphy.c b/sys/dev/mii/ukphy.c
index 9697176..9d52eb5 100644
--- a/sys/dev/mii/ukphy.c
+++ b/sys/dev/mii/ukphy.c
@@ -86,7 +86,7 @@ static device_method_t ukphy_methods[] = {
 	DEVMETHOD(device_attach,	ukphy_attach),
 	DEVMETHOD(device_detach,	mii_phy_detach),
 	DEVMETHOD(device_shutdown,	bus_generic_shutdown),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static devclass_t ukphy_devclass;
diff --git a/sys/dev/mii/xmphy.c b/sys/dev/mii/xmphy.c
index 75d3e27..328d34a 100644
--- a/sys/dev/mii/xmphy.c
+++ b/sys/dev/mii/xmphy.c
@@ -66,7 +66,7 @@ static device_method_t xmphy_methods[] = {
 	DEVMETHOD(device_attach,	xmphy_attach),
 	DEVMETHOD(device_detach,	mii_phy_detach),
 	DEVMETHOD(device_shutdown,	bus_generic_shutdown),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static devclass_t xmphy_devclass;
diff --git a/sys/dev/usb/net/ruephy.c b/sys/dev/usb/net/ruephy.c
index 64150a5..839c022 100644
--- a/sys/dev/usb/net/ruephy.c
+++ b/sys/dev/usb/net/ruephy.c
@@ -61,7 +61,7 @@ static device_method_t ruephy_methods[] = {
 	DEVMETHOD(device_attach,	ruephy_attach),
 	DEVMETHOD(device_detach,	mii_phy_detach),
 	DEVMETHOD(device_shutdown,	bus_generic_shutdown),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static devclass_t ruephy_devclass;
diff --git a/sys/dev/xl/xlphy.c b/sys/dev/xl/xlphy.c
index e5ac9fc..2fe9e0d 100644
--- a/sys/dev/xl/xlphy.c
+++ b/sys/dev/xl/xlphy.c
@@ -86,7 +86,7 @@ static device_method_t xlphy_methods[] = {
 	DEVMETHOD(device_attach,	xlphy_attach),
 	DEVMETHOD(device_detach,	mii_phy_detach),
 	DEVMETHOD(device_shutdown,	bus_generic_shutdown),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static devclass_t xlphy_devclass;