9 files changed, 1 insertions, 21 deletions

diff --git a/sys/dev/dc/dcphy.c b/sys/dev/dc/dcphy.c
index 8b6656e9977e9..7c92e627a04b6 100644
--- a/sys/dev/dc/dcphy.c
+++ b/sys/dev/dc/dcphy.c
@@ -285,7 +285,6 @@ dcphy_service(sc, mii, cmd)
 			break;
 		default:
 			return(EINVAL);
-			break;
 		}
 		break;
 
diff --git a/sys/dev/dc/pnphy.c b/sys/dev/dc/pnphy.c
index e8022edb2d7a5..ad9ad4f44be08 100644
--- a/sys/dev/dc/pnphy.c
+++ b/sys/dev/dc/pnphy.c
@@ -170,11 +170,8 @@ pnphy_service(sc, mii, cmd)
 	struct mii_data *mii;
 	int cmd;
 {
-	struct dc_softc		*dc_sc;
 	struct ifmedia_entry *ife = mii->mii_media.ifm_cur;
 
-	dc_sc = mii->mii_ifp->if_softc;
-
 	switch (cmd) {
 	case MII_POLLSTAT:
 		/*
@@ -215,17 +212,14 @@ pnphy_service(sc, mii, cmd)
 				mii->mii_media_active |= IFM_FDX;
 			MIIBUS_STATCHG(sc->mii_dev);
 			return(0);
-			break;
 		case IFM_10_T:
 			mii->mii_media_active = IFM_ETHER|IFM_10_T;
 			if ((ife->ifm_media & IFM_GMASK) == IFM_FDX)
 				mii->mii_media_active |= IFM_FDX;
 			MIIBUS_STATCHG(sc->mii_dev);
 			return(0);
-			break;
 		default:
 			return(EINVAL);
-			break;
 		}
 		break;
 
diff --git a/sys/dev/mii/bmtphy.c b/sys/dev/mii/bmtphy.c
index f6d7e561e6d3d..5fa82daf505e7 100644
--- a/sys/dev/mii/bmtphy.c
+++ b/sys/dev/mii/bmtphy.c
@@ -146,7 +146,6 @@ bmtphy_probe(device_t dev)
 		break;
 	default:
 		return (ENXIO);
-		break;
 	}
 
 	return (rval);
diff --git a/sys/dev/mii/dcphy.c b/sys/dev/mii/dcphy.c
index 8b6656e9977e9..7c92e627a04b6 100644
--- a/sys/dev/mii/dcphy.c
+++ b/sys/dev/mii/dcphy.c
@@ -285,7 +285,6 @@ dcphy_service(sc, mii, cmd)
 			break;
 		default:
 			return(EINVAL);
-			break;
 		}
 		break;
 
diff --git a/sys/dev/mii/lxtphy.c b/sys/dev/mii/lxtphy.c
index f2bf5e0e76cc2..4aa98aff5ee73 100644
--- a/sys/dev/mii/lxtphy.c
+++ b/sys/dev/mii/lxtphy.c
@@ -239,7 +239,7 @@ lxtphy_service(sc, mii, cmd)
 
 		case IFM_100_FX:
 			lxtphy_set_fx(sc);
-
+			/* XXX: fall though intentional ?? */
 		default:
 			/*
 			 * BMCR data is stored in the ifmedia entry.
diff --git a/sys/dev/mii/mii_physubr.c b/sys/dev/mii/mii_physubr.c
index 0b536e8da2a9b..f90a48686170f 100644
--- a/sys/dev/mii/mii_physubr.c
+++ b/sys/dev/mii/mii_physubr.c
@@ -520,10 +520,8 @@ int
 mii_phy_detach(device_t dev)
 {
 	struct mii_softc *sc;
-	struct mii_data *mii;
 
 	sc = device_get_softc(dev);
-	mii = device_get_softc(device_get_parent(dev));
 	mii_phy_down(sc);
 	sc->mii_dev = NULL;
 	LIST_REMOVE(sc, mii_list);
diff --git a/sys/dev/mii/mlphy.c b/sys/dev/mii/mlphy.c
index 0be644ae3e565..f158a970145a5 100644
--- a/sys/dev/mii/mlphy.c
+++ b/sys/dev/mii/mlphy.c
@@ -243,7 +243,6 @@ mlphy_service(xsc, mii, cmd)
 			(void) mii_phy_auto(sc);
 			msc->ml_linked = 0;
 			return(0);
-			break;
 		case IFM_10_T:
 			/*
 			 * For 10baseT modes, reset and program the
diff --git a/sys/dev/mii/nsgphy.c b/sys/dev/mii/nsgphy.c
index 01d11f8e130d3..81d7cee330d5a 100644
--- a/sys/dev/mii/nsgphy.c
+++ b/sys/dev/mii/nsgphy.c
@@ -132,11 +132,9 @@ nsgphy_attach(device_t dev)
 	struct mii_softc *sc;
 	struct mii_attach_args *ma;
 	struct mii_data *mii;
-	const struct mii_phydesc *mpd;
 
 	sc = device_get_softc(dev);
 	ma = device_get_ivars(dev);
-	mpd = mii_phy_match(ma, gphyters);
 	if (bootverbose)
 		device_printf(dev, "<rev. %d>\n", MII_REV(ma->mii_id2));
 	device_printf(dev, " ");
diff --git a/sys/dev/mii/pnphy.c b/sys/dev/mii/pnphy.c
index e8022edb2d7a5..ad9ad4f44be08 100644
--- a/sys/dev/mii/pnphy.c
+++ b/sys/dev/mii/pnphy.c
@@ -170,11 +170,8 @@ pnphy_service(sc, mii, cmd)
 	struct mii_data *mii;
 	int cmd;
 {
-	struct dc_softc		*dc_sc;
 	struct ifmedia_entry *ife = mii->mii_media.ifm_cur;
 
-	dc_sc = mii->mii_ifp->if_softc;
-
 	switch (cmd) {
 	case MII_POLLSTAT:
 		/*
@@ -215,17 +212,14 @@ pnphy_service(sc, mii, cmd)
 				mii->mii_media_active |= IFM_FDX;
 			MIIBUS_STATCHG(sc->mii_dev);
 			return(0);
-			break;
 		case IFM_10_T:
 			mii->mii_media_active = IFM_ETHER|IFM_10_T;
 			if ((ife->ifm_media & IFM_GMASK) == IFM_FDX)
 				mii->mii_media_active |= IFM_FDX;
 			MIIBUS_STATCHG(sc->mii_dev);
 			return(0);
-			break;
 		default:
 			return(EINVAL);
-			break;
 		}
 		break;