From 604f5f1f7790b303eb28109c3138dd3c1a1c0dff Mon Sep 17 00:00:00 2001
From: Marius Strobl <marius@FreeBSD.org>
Date: Wed, 23 Nov 2011 20:27:26 +0000
Subject: [PATCH] Use DEVMETHOD_END.

---
 sys/dev/dc/dcphy.c       | 2 +-
 sys/dev/dc/pnphy.c       | 2 +-
 sys/dev/mii/acphy.c      | 2 +-
 sys/dev/mii/amphy.c      | 2 +-
 sys/dev/mii/atphy.c      | 2 +-
 sys/dev/mii/axphy.c      | 2 +-
 sys/dev/mii/bmtphy.c     | 3 +--
 sys/dev/mii/brgphy.c     | 2 +-
 sys/dev/mii/ciphy.c      | 2 +-
 sys/dev/mii/e1000phy.c   | 2 +-
 sys/dev/mii/gentbi.c     | 2 +-
 sys/dev/mii/icsphy.c     | 2 +-
 sys/dev/mii/ip1000phy.c  | 2 +-
 sys/dev/mii/jmphy.c      | 2 +-
 sys/dev/mii/lxtphy.c     | 2 +-
 sys/dev/mii/mlphy.c      | 2 +-
 sys/dev/mii/nsgphy.c     | 2 +-
 sys/dev/mii/nsphy.c      | 2 +-
 sys/dev/mii/nsphyter.c   | 2 +-
 sys/dev/mii/pnaphy.c     | 2 +-
 sys/dev/mii/qsphy.c      | 2 +-
 sys/dev/mii/rgephy.c     | 2 +-
 sys/dev/mii/rlphy.c      | 2 +-
 sys/dev/mii/rlswitch.c   | 2 +-
 sys/dev/mii/smcphy.c     | 6 ++----
 sys/dev/mii/tdkphy.c     | 2 +-
 sys/dev/mii/tlphy.c      | 2 +-
 sys/dev/mii/truephy.c    | 2 +-
 sys/dev/mii/ukphy.c      | 2 +-
 sys/dev/mii/xmphy.c      | 2 +-
 sys/dev/usb/net/ruephy.c | 2 +-
 sys/dev/xl/xlphy.c       | 2 +-
 32 files changed, 33 insertions(+), 36 deletions(-)

diff --git a/sys/dev/dc/dcphy.c b/sys/dev/dc/dcphy.c
index ab449937b641..a05f2ed4f33b 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 6546acdd7120..98e721da2cb5 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 58e546eddc9d..c61c05bf4373 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 c5f5f5c4a92b..bd90ccf65089 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 b5cf14f44fa2..cca8813a7cb7 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 7e83f4bdd2d7..78f3901c6cbf 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 84933b76528b..81c2bd2ae1f8 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 d852e802db87..516676e102bc 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 2133c76ca057..87d0d814e918 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 e657592b6d15..91ae44d2e973 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 bf5319b605e1..05209cfaae84 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 90ec3746939f..6330d9efd620 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 9634f84edf2d..b7fb5151ae32 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 1e3eb55b17e9..14fdf7e787cc 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 f223ec6a26c8..d7059fb5ceeb 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 3708b4a8d1b6..f9b1962f2f0d 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 cd18acffa376..988e5c2cabc8 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 86a69b60274d..01cd31d77b0b 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 facdebb3d497..316117d6752b 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 0e77c4fda5ff..29f2c7851d7e 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 a504504e3a4f..a649e5c710d4 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 6d54542723a8..d5dbbc82f6bc 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 b285f7fba9a0..ddf8d73dc235 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 67c4ec37a3e1..b158fd40c37b 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 b04a91903add..fbeaddfa662b 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 83868ad90460..d07327c9a451 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 c99c7545c316..ac5cff3d46f3 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 86480f17a3ad..df17b2474edf 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 9697176b3b5d..9d52eb580ca5 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 75d3e272811d..328d34ad9a53 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 64150a58bf65..839c0225d14d 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 e5ac9fce4b29..2fe9e0d9058d 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;