diff options
| author | marius <marius@FreeBSD.org> | 2010-10-15 15:46:58 +0000 |
|---|---|---|
| committer | marius <marius@FreeBSD.org> | 2010-10-15 15:46:58 +0000 |
| commit | 6c3cf86b506db5c89cc9283f5a8668d22ec8ebf3 (patch) | |
| tree | 9baa32c27978b7c4f817826ec8e3a17b5a85e9b0 | |
| parent | 9a2d058f58ba6ef326a46ead3e9d1fbb500664c1 (diff) | |
| download | FreeBSD-src-6c3cf86b506db5c89cc9283f5a8668d22ec8ebf3.zip FreeBSD-src-6c3cf86b506db5c89cc9283f5a8668d22ec8ebf3.tar.gz | |
Now that all previous users of mii_phy_probe() have been converted
in r213893 and r213894 to use mii_attach() instead remove the former
and along with it the "EVIL HACK".
MFC after: never
| -rw-r--r-- | sys/dev/mii/mii.c | 15 | ||||
| -rw-r--r-- | sys/dev/mii/miivar.h | 1 | ||||
| -rw-r--r-- | sys/modules/mii/Makefile | 1 |
3 files changed, 0 insertions, 17 deletions
diff --git a/sys/dev/mii/mii.c b/sys/dev/mii/mii.c index 263a18b..79378f5 100644 --- a/sys/dev/mii/mii.c +++ b/sys/dev/mii/mii.c @@ -454,21 +454,6 @@ mii_attach(device_t dev, device_t *miibus, struct ifnet *ifp, return (rv); } -int -mii_phy_probe(device_t dev, device_t *child, ifm_change_cb_t ifmedia_upd, - ifm_stat_cb_t ifmedia_sts) -{ - struct ifnet *ifp; - - /* - * Note that each NIC's softc must start with an ifnet pointer. - * XXX: EVIL HACK! - */ - ifp = *(struct ifnet **)device_get_softc(dev); - return (mii_attach(dev, child, ifp, ifmedia_upd, ifmedia_sts, - BMSR_DEFCAPMASK, MII_PHY_ANY, MII_OFFSET_ANY, 0)); -} - /* * Media changed; notify all PHYs. */ diff --git a/sys/dev/mii/miivar.h b/sys/dev/mii/miivar.h index 9196f8d..78d152a 100644 --- a/sys/dev/mii/miivar.h +++ b/sys/dev/mii/miivar.h @@ -232,7 +232,6 @@ void mii_down(struct mii_data *); int mii_mediachg(struct mii_data *); void mii_tick(struct mii_data *); void mii_pollstat(struct mii_data *); -int mii_phy_probe(device_t, device_t *, ifm_change_cb_t, ifm_stat_cb_t); void mii_add_media(struct mii_softc *); void mii_phy_add_media(struct mii_softc *); diff --git a/sys/modules/mii/Makefile b/sys/modules/mii/Makefile index 23ec702..c1ffae2 100644 --- a/sys/modules/mii/Makefile +++ b/sys/modules/mii/Makefile @@ -14,7 +14,6 @@ SRCS+= xmphy.c EXPORT_SYMS= mii_attach \ mii_mediachg \ - mii_phy_probe \ mii_phy_reset \ mii_pollstat \ mii_tick |
