From e88fd11fa63919f0d0ba952544f8abe033024e9e Mon Sep 17 00:00:00 2001 From: marius Date: Sat, 2 Dec 2006 19:36:25 +0000 Subject: Some style changes to a couple of PHY drivers: - Fix some whitespace nits. - Fix some spelling in comments. - Use MII_ANEGTICKS instead of 5. - Don't define variables in nested scope. - Remove superfluous returns at the end of void functions. - Remove unused static global rgephy_mii_model. - Remove dupe $Id$ in tdkphy(4). - Sort brgphys table. MFC after: 2 weeks --- sys/dev/mii/ciphy.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'sys/dev/mii/ciphy.c') diff --git a/sys/dev/mii/ciphy.c b/sys/dev/mii/ciphy.c index ed601ad..07eb5e0 100644 --- a/sys/dev/mii/ciphy.c +++ b/sys/dev/mii/ciphy.c @@ -44,7 +44,6 @@ __FBSDID("$FreeBSD$"); #include #include - #include #include #include @@ -265,7 +264,7 @@ setit: /* * Only retry autonegotiation every 5 seconds. */ - if (++sc->mii_ticks <= 5/*10*/) + if (++sc->mii_ticks <= MII_ANEGTICKS) break; sc->mii_ticks = 0; @@ -335,17 +334,14 @@ ciphy_status(struct mii_softc *sc) if (bmsr & CIPHY_AUXCSR_FDX) mii->mii_media_active |= IFM_FDX; - - return; } static void ciphy_reset(struct mii_softc *sc) { + mii_phy_reset(sc); DELAY(1000); - - return; } #define PHY_SETBIT(x, y, z) \ @@ -405,6 +401,4 @@ ciphy_fixup(struct mii_softc *sc) model); break; } - - return; } -- cgit v1.1