Author: marius
Date: Wed Nov 23 20:27:26 2011
New Revision: 227908
URL: http://svn.freebsd.org/changeset/base/227908
Log:
Use DEVMETHOD_END.
Modified:
head/sys/dev/dc/dcphy.c
head/sys/dev/dc/pnphy.c
head/sys/dev/mii/acphy.c
head/sys/dev/mii/amphy.c
head/sys/dev/mii/atphy.c
head/sys/dev/mii/axphy.c
head/sys/dev/mii/bmtphy.c
head/sys/dev/mii/brgphy.c
head/sys/dev/mii/ciphy.c
head/sys/dev/mii/e1000phy.c
head/sys/dev/mii/gentbi.c
head/sys/dev/mii/icsphy.c
head/sys/dev/mii/ip1000phy.c
head/sys/dev/mii/jmphy.c
head/sys/dev/mii/lxtphy.c
head/sys/dev/mii/mlphy.c
head/sys/dev/mii/nsgphy.c
head/sys/dev/mii/nsphy.c
head/sys/dev/mii/nsphyter.c
head/sys/dev/mii/pnaphy.c
head/sys/dev/mii/qsphy.c
head/sys/dev/mii/rgephy.c
head/sys/dev/mii/rlphy.c
head/sys/dev/mii/rlswitch.c
head/sys/dev/mii/smcphy.c
head/sys/dev/mii/tdkphy.c
head/sys/dev/mii/tlphy.c
head/sys/dev/mii/truephy.c
head/sys/dev/mii/ukphy.c
head/sys/dev/mii/xmphy.c
head/sys/dev/usb/net/ruephy.c
head/sys/dev/xl/xlphy.c
Modified: head/sys/dev/dc/dcphy.c
==============================================================================
--- head/sys/dev/dc/dcphy.c Wed Nov 23 20:09:34 2011 (r227907)
+++ head/sys/dev/dc/dcphy.c Wed Nov 23 20:27:26 2011 (r227908)
@@ -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;
Modified: head/sys/dev/dc/pnphy.c
==============================================================================
--- head/sys/dev/dc/pnphy.c Wed Nov 23 20:09:34 2011 (r227907)
+++ head/sys/dev/dc/pnphy.c Wed Nov 23 20:27:26 2011 (r227908)
@@ -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;
Modified: head/sys/dev/mii/acphy.c
==============================================================================
--- head/sys/dev/mii/acphy.c Wed Nov 23 20:09:34 2011 (r227907)
+++ head/sys/dev/mii/acphy.c Wed Nov 23 20:27:26 2011 (r227908)
@@ -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;
Modified: head/sys/dev/mii/amphy.c
==============================================================================
--- head/sys/dev/mii/amphy.c Wed Nov 23 20:09:34 2011 (r227907)
+++ head/sys/dev/mii/amphy.c Wed Nov 23 20:27:26 2011 (r227908)
@@ -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;
Modified: head/sys/dev/mii/atphy.c
==============================================================================
--- head/sys/dev/mii/atphy.c Wed Nov 23 20:09:34 2011 (r227907)
+++ head/sys/dev/mii/atphy.c Wed Nov 23 20:27:26 2011 (r227908)
@@ -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;
Modified: head/sys/dev/mii/axphy.c
==============================================================================
--- head/sys/dev/mii/axphy.c Wed Nov 23 20:09:34 2011 (r227907)
+++ head/sys/dev/mii/axphy.c Wed Nov 23 20:27:26 2011 (r227908)
@@ -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;
Modified: head/sys/dev/mii/bmtphy.c
==============================================================================
--- head/sys/dev/mii/bmtphy.c Wed Nov 23 20:09:34 2011 (r227907)
+++ head/sys/dev/mii/bmtphy.c Wed Nov 23 20:27:26 2011 (r227908)
@@ -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;
Modified: head/sys/dev/mii/brgphy.c
==============================================================================
--- head/sys/dev/mii/brgphy.c Wed Nov 23 20:09:34 2011 (r227907)
+++ head/sys/dev/mii/brgphy.c Wed Nov 23 20:27:26 2011 (r227908)
@@ -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;
Modified: head/sys/dev/mii/ciphy.c
==============================================================================
--- head/sys/dev/mii/ciphy.c Wed Nov 23 20:09:34 2011 (r227907)
+++ head/sys/dev/mii/ciphy.c Wed Nov 23 20:27:26 2011 (r227908)
@@ -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;
Modified: head/sys/dev/mii/e1000phy.c
==============================================================================
--- head/sys/dev/mii/e1000phy.c Wed Nov 23 20:09:34 2011 (r227907)
+++ head/sys/dev/mii/e1000phy.c Wed Nov 23 20:27:26 2011 (r227908)
@@ -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;
Modified: head/sys/dev/mii/gentbi.c
==============================================================================
--- head/sys/dev/mii/gentbi.c Wed Nov 23 20:09:34 2011 (r227907)
+++ head/sys/dev/mii/gentbi.c Wed Nov 23 20:27:26 2011 (r227908)
@@ -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;
Modified: head/sys/dev/mii/icsphy.c
==============================================================================
--- head/sys/dev/mii/icsphy.c Wed Nov 23 20:09:34 2011 (r227907)
+++ head/sys/dev/mii/icsphy.c Wed Nov 23 20:27:26 2011 (r227908)
@@ -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;
Modified: head/sys/dev/mii/ip1000phy.c
==============================================================================
--- head/sys/dev/mii/ip1000phy.c Wed Nov 23 20:09:34 2011
(r227907)
+++ head/sys/dev/mii/ip1000phy.c Wed Nov 23 20:27:26 2011
(r227908)
@@ -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;
Modified: head/sys/dev/mii/jmphy.c
==============================================================================
--- head/sys/dev/mii/jmphy.c Wed Nov 23 20:09:34 2011 (r227907)
+++ head/sys/dev/mii/jmphy.c Wed Nov 23 20:27:26 2011 (r227908)
@@ -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;
Modified: head/sys/dev/mii/lxtphy.c
==============================================================================
--- head/sys/dev/mii/lxtphy.c Wed Nov 23 20:09:34 2011 (r227907)
+++ head/sys/dev/mii/lxtphy.c Wed Nov 23 20:27:26 2011 (r227908)
@@ -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;
Modified: head/sys/dev/mii/mlphy.c
==============================================================================
--- head/sys/dev/mii/mlphy.c Wed Nov 23 20:09:34 2011 (r227907)
+++ head/sys/dev/mii/mlphy.c Wed Nov 23 20:27:26 2011 (r227908)
@@ -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;
Modified: head/sys/dev/mii/nsgphy.c
==============================================================================
--- head/sys/dev/mii/nsgphy.c Wed Nov 23 20:09:34 2011 (r227907)
+++ head/sys/dev/mii/nsgphy.c Wed Nov 23 20:27:26 2011 (r227908)
@@ -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;
Modified: head/sys/dev/mii/nsphy.c
==============================================================================
--- head/sys/dev/mii/nsphy.c Wed Nov 23 20:09:34 2011 (r227907)
+++ head/sys/dev/mii/nsphy.c Wed Nov 23 20:27:26 2011 (r227908)
@@ -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;
Modified: head/sys/dev/mii/nsphyter.c
==============================================================================
--- head/sys/dev/mii/nsphyter.c Wed Nov 23 20:09:34 2011 (r227907)
+++ head/sys/dev/mii/nsphyter.c Wed Nov 23 20:27:26 2011 (r227908)
@@ -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;
Modified: head/sys/dev/mii/pnaphy.c
==============================================================================
--- head/sys/dev/mii/pnaphy.c Wed Nov 23 20:09:34 2011 (r227907)
+++ head/sys/dev/mii/pnaphy.c Wed Nov 23 20:27:26 2011 (r227908)
@@ -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;
Modified: head/sys/dev/mii/qsphy.c
==============================================================================
--- head/sys/dev/mii/qsphy.c Wed Nov 23 20:09:34 2011 (r227907)
+++ head/sys/dev/mii/qsphy.c Wed Nov 23 20:27:26 2011 (r227908)
@@ -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;
Modified: head/sys/dev/mii/rgephy.c
==============================================================================
--- head/sys/dev/mii/rgephy.c Wed Nov 23 20:09:34 2011 (r227907)
+++ head/sys/dev/mii/rgephy.c Wed Nov 23 20:27:26 2011 (r227908)
@@ -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;
Modified: head/sys/dev/mii/rlphy.c
==============================================================================
--- head/sys/dev/mii/rlphy.c Wed Nov 23 20:09:34 2011 (r227907)
+++ head/sys/dev/mii/rlphy.c Wed Nov 23 20:27:26 2011 (r227908)
@@ -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;
Modified: head/sys/dev/mii/rlswitch.c
==============================================================================
--- head/sys/dev/mii/rlswitch.c Wed Nov 23 20:09:34 2011 (r227907)
+++ head/sys/dev/mii/rlswitch.c Wed Nov 23 20:27:26 2011 (r227908)
@@ -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;
Modified: head/sys/dev/mii/smcphy.c
==============================================================================
--- head/sys/dev/mii/smcphy.c Wed Nov 23 20:09:34 2011 (r227907)
+++ head/sys/dev/mii/smcphy.c Wed Nov 23 20:27:26 2011 (r227908)
@@ -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 me
{
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);
Modified: head/sys/dev/mii/tdkphy.c
==============================================================================
--- head/sys/dev/mii/tdkphy.c Wed Nov 23 20:09:34 2011 (r227907)
+++ head/sys/dev/mii/tdkphy.c Wed Nov 23 20:27:26 2011 (r227908)
@@ -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;
Modified: head/sys/dev/mii/tlphy.c
==============================================================================
--- head/sys/dev/mii/tlphy.c Wed Nov 23 20:09:34 2011 (r227907)
+++ head/sys/dev/mii/tlphy.c Wed Nov 23 20:27:26 2011 (r227908)
@@ -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;
Modified: head/sys/dev/mii/truephy.c
==============================================================================
--- head/sys/dev/mii/truephy.c Wed Nov 23 20:09:34 2011 (r227907)
+++ head/sys/dev/mii/truephy.c Wed Nov 23 20:27:26 2011 (r227908)
@@ -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[] = {
Modified: head/sys/dev/mii/ukphy.c
==============================================================================
--- head/sys/dev/mii/ukphy.c Wed Nov 23 20:09:34 2011 (r227907)
+++ head/sys/dev/mii/ukphy.c Wed Nov 23 20:27:26 2011 (r227908)
@@ -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;
Modified: head/sys/dev/mii/xmphy.c
==============================================================================
--- head/sys/dev/mii/xmphy.c Wed Nov 23 20:09:34 2011 (r227907)
+++ head/sys/dev/mii/xmphy.c Wed Nov 23 20:27:26 2011 (r227908)
@@ -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;
Modified: head/sys/dev/usb/net/ruephy.c
==============================================================================
--- head/sys/dev/usb/net/ruephy.c Wed Nov 23 20:09:34 2011
(r227907)
+++ head/sys/dev/usb/net/ruephy.c Wed Nov 23 20:27:26 2011
(r227908)
@@ -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;
Modified: head/sys/dev/xl/xlphy.c
==============================================================================
--- head/sys/dev/xl/xlphy.c Wed Nov 23 20:09:34 2011 (r227907)
+++ head/sys/dev/xl/xlphy.c Wed Nov 23 20:27:26 2011 (r227908)
@@ -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;
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
