Make one generic mii_phy_detach() to replace 19 slightly different ones.

Rename mii_phy_auto_stop() mii_phy_down().

Introduce mii_down(), use it from nge.  Do not indirect it to 19 identical
case's in 19 switchstatements like NetBSD did.

1 files changed, 1 insertions, 17 deletions

diff --git a/sys/dev/mii/mlphy.c b/sys/dev/mii/mlphy.c
index c983b71..44ab59d 100644
--- a/sys/dev/mii/mlphy.c
+++ b/sys/dev/mii/mlphy.c
@@ -74,13 +74,12 @@ struct mlphy_softc	{
 
 static int mlphy_probe		(device_t);
 static int mlphy_attach		(device_t);
-static int mlphy_detach		(device_t);
 
 static device_method_t mlphy_methods[] = {
 	/* device interface */
 	DEVMETHOD(device_probe,		mlphy_probe),
 	DEVMETHOD(device_attach,	mlphy_attach),
-	DEVMETHOD(device_detach,	mlphy_detach),
+	DEVMETHOD(device_detach,	mii_phy_detach),
 	DEVMETHOD(device_shutdown,	bus_generic_shutdown),
 	{ 0, 0 }
 };
@@ -174,21 +173,6 @@ static int mlphy_attach(dev)
 	return(0);
 }
 
-static int mlphy_detach(dev)
-	device_t		dev;
-{
-	struct mlphy_softc	*sc;
-	struct mii_data		*mii;
-
-	sc = device_get_softc(dev);
-	mii = device_get_softc(device_get_parent(dev));
-	mii_phy_auto_stop(&sc->ml_mii);
-	sc->ml_mii.mii_dev = NULL;
-	LIST_REMOVE(&sc->ml_mii, mii_list);
-
-	return(0);
-}
-
 static int
 mlphy_service(xsc, mii, cmd)
 	struct mii_softc *xsc;