Use the mii_data provided via mii_attach_args and mii_pdata respectively - src

diff options


context:
space:
mode:

author	Marius Strobl <marius@FreeBSD.org>	2010-09-27 20:31:03 +0000
committer	Marius Strobl <marius@FreeBSD.org>	2010-09-27 20:31:03 +0000
commit	7b9a15f73c414ea3a51b002cbd29685fe19a8c3b (patch)
tree	b0e2315e90b0b277970494dfb4e685bc75aa7e83 /sys
parent	a71199dab43a540d3ca13e232a02670a39078e67 (diff)

Notes

Diffstat (limited to 'sys')

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

sys/dev/mii/e1000phy.c

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

sys/dev/mii/ip1000phy.c

-rw-r--r--

sys/dev/mii/jmphy.c

-rw-r--r--

sys/dev/mii/lxtphy.c

-rw-r--r--

sys/dev/mii/mii_physubr.c

-rw-r--r--

sys/dev/mii/mlphy.c

-rw-r--r--

sys/dev/mii/nsgphy.c

-rw-r--r--

sys/dev/mii/nsphy.c

-rw-r--r--

sys/dev/mii/nsphyter.c

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

sys/dev/mii/rlswitch.c

-rw-r--r--

sys/dev/mii/ruephy.c

-rw-r--r--

sys/dev/mii/smcphy.c

-rw-r--r--

sys/dev/mii/tdkphy.c

-rw-r--r--

sys/dev/mii/truephy.c

-rw-r--r--

sys/dev/mii/ukphy.c

-rw-r--r--

sys/dev/mii/xmphy.c

33 files changed, 33 insertions, 34 deletions

diff --git a/sys/dev/dc/dcphy.c b/sys/dev/dc/dcphy.c
index a4df704316e0..031b1e5d1e7e 100644
--- a/sys/dev/dc/dcphy.c
+++ b/sys/dev/dc/dcphy.c

@@ -146,7 +146,7 @@ dcphy_attach(device_t dev)

sc = device_get_softc(dev);

ma = device_get_ivars(dev);

sc->mii_dev = device_get_parent(dev);

- mii = device_get_softc(sc->mii_dev);

+ mii = ma->mii_data;

LIST_INSERT_HEAD(&mii->mii_phys, sc, mii_list);

sc->mii_inst = mii->mii_instance;

diff --git a/sys/dev/dc/pnphy.c b/sys/dev/dc/pnphy.c
index d1282a78c6f5..187089e0eab2 100644
--- a/sys/dev/dc/pnphy.c
+++ b/sys/dev/dc/pnphy.c

@@ -129,7 +129,7 @@ pnphy_attach(device_t dev)

sc = device_get_softc(dev);

ma = device_get_ivars(dev);

sc->mii_dev = device_get_parent(dev);

- mii = device_get_softc(sc->mii_dev);

+ mii = ma->mii_data;

LIST_INSERT_HEAD(&mii->mii_phys, sc, mii_list);

sc->mii_inst = mii->mii_instance;

diff --git a/sys/dev/mii/acphy.c b/sys/dev/mii/acphy.c
index 4a705ac774a5..057b104f0a2c 100644
--- a/sys/dev/mii/acphy.c
+++ b/sys/dev/mii/acphy.c

@@ -129,7 +129,7 @@ acphy_attach(device_t dev)

sc = device_get_softc(dev);

ma = device_get_ivars(dev);

sc->mii_dev = device_get_parent(dev);

- mii = device_get_softc(sc->mii_dev);

+ mii = ma->mii_data;

LIST_INSERT_HEAD(&mii->mii_phys, sc, mii_list);

sc->mii_inst = mii->mii_instance;

diff --git a/sys/dev/mii/amphy.c b/sys/dev/mii/amphy.c
index 3c06561fd9ef..f493de470651 100644
--- a/sys/dev/mii/amphy.c
+++ b/sys/dev/mii/amphy.c

@@ -106,7 +106,7 @@ amphy_attach(device_t dev)

sc = device_get_softc(dev);

ma = device_get_ivars(dev);

sc->mii_dev = device_get_parent(dev);

- mii = device_get_softc(sc->mii_dev);

+ mii = ma->mii_data;

LIST_INSERT_HEAD(&mii->mii_phys, sc, mii_list);

sc->mii_inst = mii->mii_instance;

diff --git a/sys/dev/mii/atphy.c b/sys/dev/mii/atphy.c
index f370c80ed956..a95382e45d48 100644
--- a/sys/dev/mii/atphy.c
+++ b/sys/dev/mii/atphy.c

@@ -110,7 +110,7 @@ atphy_attach(device_t dev)

sc = &asc->mii_sc;

ma = device_get_ivars(dev);

sc->mii_dev = device_get_parent(dev);

- mii = device_get_softc(sc->mii_dev);

+ mii = ma->mii_data;

LIST_INSERT_HEAD(&mii->mii_phys, sc, mii_list);

sc->mii_inst = mii->mii_instance;

diff --git a/sys/dev/mii/axphy.c b/sys/dev/mii/axphy.c
index 21ac6f0c3e46..931f2eb6decc 100644
--- a/sys/dev/mii/axphy.c
+++ b/sys/dev/mii/axphy.c

@@ -96,7 +96,7 @@ axphy_attach(device_t dev)

sc = device_get_softc(dev);

ma = device_get_ivars(dev);

sc->mii_dev = device_get_parent(dev);

- mii = device_get_softc(sc->mii_dev);

+ mii = ma->mii_data;

LIST_INSERT_HEAD(&mii->mii_phys, sc, mii_list);

sc->mii_inst = mii->mii_instance;

diff --git a/sys/dev/mii/bmtphy.c b/sys/dev/mii/bmtphy.c
index 13af812b3d26..0e9b5cc1c2bf 100644
--- a/sys/dev/mii/bmtphy.c
+++ b/sys/dev/mii/bmtphy.c

@@ -144,7 +144,7 @@ bmtphy_attach(device_t dev)

sc = device_get_softc(dev);

ma = device_get_ivars(dev);

sc->mii_dev = device_get_parent(dev);

- mii = device_get_softc(sc->mii_dev);

+ mii = ma->mii_data;

LIST_INSERT_HEAD(&mii->mii_phys, sc, mii_list);

sc->mii_inst = mii->mii_instance;

diff --git a/sys/dev/mii/brgphy.c b/sys/dev/mii/brgphy.c
index b921a8c014a8..c0175ff085f4 100644
--- a/sys/dev/mii/brgphy.c
+++ b/sys/dev/mii/brgphy.c

@@ -187,7 +187,7 @@ brgphy_attach(device_t dev)

sc = &bsc->mii_sc;

ma = device_get_ivars(dev);

sc->mii_dev = device_get_parent(dev);

- mii = device_get_softc(sc->mii_dev);

+ mii = ma->mii_data;

LIST_INSERT_HEAD(&mii->mii_phys, sc, mii_list);

/* Initialize mii_softc structure */

diff --git a/sys/dev/mii/ciphy.c b/sys/dev/mii/ciphy.c
index 22f0818215ec..9bd37d3ccfd1 100644
--- a/sys/dev/mii/ciphy.c
+++ b/sys/dev/mii/ciphy.c

@@ -115,7 +115,7 @@ ciphy_attach(device_t dev)

sc = device_get_softc(dev);

ma = device_get_ivars(dev);

sc->mii_dev = device_get_parent(dev);

- mii = device_get_softc(sc->mii_dev);

+ mii = ma->mii_data;

LIST_INSERT_HEAD(&mii->mii_phys, sc, mii_list);

sc->mii_inst = mii->mii_instance;

diff --git a/sys/dev/mii/e1000phy.c b/sys/dev/mii/e1000phy.c
index 4e68ec685073..94de72492af3 100644
--- a/sys/dev/mii/e1000phy.c
+++ b/sys/dev/mii/e1000phy.c

@@ -141,7 +141,7 @@ e1000phy_attach(device_t dev)

sc = &esc->mii_sc;

ma = device_get_ivars(dev);

sc->mii_dev = device_get_parent(dev);

- mii = device_get_softc(sc->mii_dev);

+ mii = ma->mii_data;

LIST_INSERT_HEAD(&mii->mii_phys, sc, mii_list);

sc->mii_inst = mii->mii_instance;

diff --git a/sys/dev/mii/exphy.c b/sys/dev/mii/exphy.c
index a64a0c4ddc36..c87d2baf535e 100644
--- a/sys/dev/mii/exphy.c
+++ b/sys/dev/mii/exphy.c

@@ -135,7 +135,7 @@ exphy_attach(device_t dev)

sc = device_get_softc(dev);

ma = device_get_ivars(dev);

sc->mii_dev = device_get_parent(dev);

- mii = device_get_softc(sc->mii_dev);

+ mii = ma->mii_data;

* The 3Com PHY can never be isolated, so never allow non-zero

diff --git a/sys/dev/mii/gentbi.c b/sys/dev/mii/gentbi.c
index 6a4d438feb65..19f50e990121 100644
--- a/sys/dev/mii/gentbi.c
+++ b/sys/dev/mii/gentbi.c

@@ -158,7 +158,7 @@ gentbi_attach(device_t dev)

sc = device_get_softc(dev);

ma = device_get_ivars(dev);

sc->mii_dev = device_get_parent(dev);

- mii = device_get_softc(sc->mii_dev);

+ mii = ma->mii_data;

LIST_INSERT_HEAD(&mii->mii_phys, sc, mii_list);

if (bootverbose)

diff --git a/sys/dev/mii/icsphy.c b/sys/dev/mii/icsphy.c
index a631bf9298e6..ac58165e6ad8 100644
--- a/sys/dev/mii/icsphy.c
+++ b/sys/dev/mii/icsphy.c

@@ -138,7 +138,7 @@ icsphy_attach(device_t dev)

sc = &isc->mii_sc;

ma = device_get_ivars(dev);

sc->mii_dev = device_get_parent(dev);

- mii = device_get_softc(sc->mii_dev);

+ mii = ma->mii_data;

LIST_INSERT_HEAD(&mii->mii_phys, sc, mii_list);

sc->mii_inst = mii->mii_instance;

diff --git a/sys/dev/mii/inphy.c b/sys/dev/mii/inphy.c
index 44c3a4d86b84..55b46aa6a698 100644
--- a/sys/dev/mii/inphy.c
+++ b/sys/dev/mii/inphy.c

@@ -104,7 +104,7 @@ inphy_attach(device_t dev)

sc = device_get_softc(dev);

ma = device_get_ivars(dev);

sc->mii_dev = device_get_parent(dev);

- mii = device_get_softc(sc->mii_dev);

+ mii = ma->mii_data;

LIST_INSERT_HEAD(&mii->mii_phys, sc, mii_list);

sc->mii_inst = mii->mii_instance;

diff --git a/sys/dev/mii/ip1000phy.c b/sys/dev/mii/ip1000phy.c
index 9b406d778951..0aeb34eb406d 100644
--- a/sys/dev/mii/ip1000phy.c
+++ b/sys/dev/mii/ip1000phy.c

@@ -111,7 +111,7 @@ ip1000phy_attach(device_t dev)

sc = &isc->mii_sc;

ma = device_get_ivars(dev);

sc->mii_dev = device_get_parent(dev);

- mii = device_get_softc(sc->mii_dev);

+ mii = ma->mii_data;

LIST_INSERT_HEAD(&mii->mii_phys, sc, mii_list);

sc->mii_inst = mii->mii_instance;

diff --git a/sys/dev/mii/jmphy.c b/sys/dev/mii/jmphy.c
index f66510a7e472..296693051445 100644
--- a/sys/dev/mii/jmphy.c
+++ b/sys/dev/mii/jmphy.c

@@ -109,7 +109,7 @@ jmphy_attach(device_t dev)

sc = &jsc->mii_sc;

ma = device_get_ivars(dev);

sc->mii_dev = device_get_parent(dev);

- mii = device_get_softc(sc->mii_dev);

+ mii = ma->mii_data;

LIST_INSERT_HEAD(&mii->mii_phys, sc, mii_list);

sc->mii_inst = mii->mii_instance;

diff --git a/sys/dev/mii/lxtphy.c b/sys/dev/mii/lxtphy.c
index 556e88d38036..8aca2439ed3c 100644
--- a/sys/dev/mii/lxtphy.c
+++ b/sys/dev/mii/lxtphy.c

@@ -132,7 +132,7 @@ lxtphy_attach(device_t dev)

sc = device_get_softc(dev);

ma = device_get_ivars(dev);

sc->mii_dev = device_get_parent(dev);

- mii = device_get_softc(sc->mii_dev);

+ mii = ma->mii_data;

LIST_INSERT_HEAD(&mii->mii_phys, sc, mii_list);

sc->mii_inst = mii->mii_instance;

diff --git a/sys/dev/mii/mii_physubr.c b/sys/dev/mii/mii_physubr.c
index c8b9ecede552..18d8ce87814c 100644
--- a/sys/dev/mii/mii_physubr.c
+++ b/sys/dev/mii/mii_physubr.c

@@ -326,10 +326,9 @@ mii_anar(int media)

void

mii_add_media(struct mii_softc *sc)

{

+ struct mii_data *mii = sc->mii_pdata;

const char *sep = "";

- struct mii_data *mii;

- mii = device_get_softc(sc->mii_dev);

if ((sc->mii_capabilities & BMSR_MEDIAMASK) == 0) {

printf("no media present");

return;

diff --git a/sys/dev/mii/mlphy.c b/sys/dev/mii/mlphy.c
index a99d2421896f..25d2c95ceda0 100644
--- a/sys/dev/mii/mlphy.c
+++ b/sys/dev/mii/mlphy.c

@@ -143,7 +143,7 @@ mlphy_attach(dev)

sc = &msc->ml_mii;

ma = device_get_ivars(dev);

sc->mii_dev = device_get_parent(dev);

- mii = device_get_softc(sc->mii_dev);

+ mii = ma->mii_data;

LIST_INSERT_HEAD(&mii->mii_phys, sc, mii_list);

sc->mii_inst = mii->mii_instance;

diff --git a/sys/dev/mii/nsgphy.c b/sys/dev/mii/nsgphy.c
index 77ee0f8ff451..b7dcee7525e4 100644
--- a/sys/dev/mii/nsgphy.c
+++ b/sys/dev/mii/nsgphy.c

@@ -126,7 +126,7 @@ nsgphy_attach(device_t dev)

device_printf(dev, "<rev. %d>\n", MII_REV(ma->mii_id2));

device_printf(dev, " ");

sc->mii_dev = device_get_parent(dev);

- mii = device_get_softc(sc->mii_dev);

+ mii = ma->mii_data;

LIST_INSERT_HEAD(&mii->mii_phys, sc, mii_list);

sc->mii_inst = mii->mii_instance;

diff --git a/sys/dev/mii/nsphy.c b/sys/dev/mii/nsphy.c
index a12c6c2df659..7351adf17044 100644
--- a/sys/dev/mii/nsphy.c
+++ b/sys/dev/mii/nsphy.c

@@ -130,7 +130,7 @@ nsphy_attach(device_t dev)

sc = device_get_softc(dev);

ma = device_get_ivars(dev);

sc->mii_dev = device_get_parent(dev);

- mii = device_get_softc(sc->mii_dev);

+ mii = ma->mii_data;

LIST_INSERT_HEAD(&mii->mii_phys, sc, mii_list);

sc->mii_inst = mii->mii_instance;

diff --git a/sys/dev/mii/nsphyter.c b/sys/dev/mii/nsphyter.c
index d1bdb368ae27..f07e62ca44ed 100644
--- a/sys/dev/mii/nsphyter.c
+++ b/sys/dev/mii/nsphyter.c

@@ -135,7 +135,7 @@ nsphyter_attach(device_t dev)

sc = device_get_softc(dev);

ma = device_get_ivars(dev);

sc->mii_dev = device_get_parent(dev);

- mii = device_get_softc(sc->mii_dev);

+ mii = ma->mii_data;

LIST_INSERT_HEAD(&mii->mii_phys, sc, mii_list);

sc->mii_inst = mii->mii_instance;

diff --git a/sys/dev/mii/pnaphy.c b/sys/dev/mii/pnaphy.c
index d37ffafa0d0e..bb9e00613e8c 100644
--- a/sys/dev/mii/pnaphy.c
+++ b/sys/dev/mii/pnaphy.c

@@ -107,7 +107,7 @@ pnaphy_attach(device_t dev)

sc = device_get_softc(dev);

ma = device_get_ivars(dev);

sc->mii_dev = device_get_parent(dev);

- mii = device_get_softc(sc->mii_dev);

+ mii = ma->mii_data;

LIST_INSERT_HEAD(&mii->mii_phys, sc, mii_list);

sc->mii_inst = mii->mii_instance;

diff --git a/sys/dev/mii/qsphy.c b/sys/dev/mii/qsphy.c
index b1498dfeca09..f97d371fa886 100644
--- a/sys/dev/mii/qsphy.c
+++ b/sys/dev/mii/qsphy.c

@@ -130,7 +130,7 @@ qsphy_attach(device_t dev)

sc = device_get_softc(dev);

ma = device_get_ivars(dev);

sc->mii_dev = device_get_parent(dev);

- mii = device_get_softc(sc->mii_dev);

+ mii = ma->mii_data;

LIST_INSERT_HEAD(&mii->mii_phys, sc, mii_list);

sc->mii_inst = mii->mii_instance;

diff --git a/sys/dev/mii/rgephy.c b/sys/dev/mii/rgephy.c
index 52d07d5ac4ed..1d7d60bb125c 100644
--- a/sys/dev/mii/rgephy.c
+++ b/sys/dev/mii/rgephy.c

@@ -119,7 +119,7 @@ rgephy_attach(device_t dev)

sc = &rsc->mii_sc;

ma = device_get_ivars(dev);

sc->mii_dev = device_get_parent(dev);

- mii = device_get_softc(sc->mii_dev);

+ mii = ma->mii_data;

LIST_INSERT_HEAD(&mii->mii_phys, sc, mii_list);

sc->mii_inst = mii->mii_instance;

diff --git a/sys/dev/mii/rlphy.c b/sys/dev/mii/rlphy.c
index fbbdfd044b38..e2ceb6205cd7 100644
--- a/sys/dev/mii/rlphy.c
+++ b/sys/dev/mii/rlphy.c

@@ -129,7 +129,7 @@ rlphy_attach(device_t dev)

sc = device_get_softc(dev);

ma = device_get_ivars(dev);

sc->mii_dev = device_get_parent(dev);

- mii = device_get_softc(sc->mii_dev);

+ mii = ma->mii_data;

* Check whether we're the RTL8201L PHY and remember so the status

diff --git a/sys/dev/mii/rlswitch.c b/sys/dev/mii/rlswitch.c
index 95e1e7f46dbd..0e001f8b15f8 100644
--- a/sys/dev/mii/rlswitch.c
+++ b/sys/dev/mii/rlswitch.c

@@ -117,7 +117,7 @@ rlswitch_attach(device_t dev)

sc = device_get_softc(dev);

ma = device_get_ivars(dev);

sc->mii_dev = device_get_parent(dev);

- mii = device_get_softc(sc->mii_dev);

+ mii = ma->mii_data;

* We handle all pseudo PHY in a single instance, so never allow

diff --git a/sys/dev/mii/ruephy.c b/sys/dev/mii/ruephy.c
index a1b43bcda77c..a9f2bbdcf04e 100644
--- a/sys/dev/mii/ruephy.c
+++ b/sys/dev/mii/ruephy.c

@@ -108,7 +108,7 @@ ruephy_attach(device_t dev)

sc = device_get_softc(dev);

ma = device_get_ivars(dev);

sc->mii_dev = device_get_parent(dev);

- mii = device_get_softc(sc->mii_dev);

+ mii = ma->mii_data;

* The RealTek PHY can never be isolated, so never allow non-zero

diff --git a/sys/dev/mii/smcphy.c b/sys/dev/mii/smcphy.c
index 36771e50cf2c..8c593bd09bfa 100644
--- a/sys/dev/mii/smcphy.c
+++ b/sys/dev/mii/smcphy.c

@@ -102,7 +102,7 @@ smcphy_attach(device_t dev)

sc = device_get_softc(dev);

ma = device_get_ivars(dev);

sc->mii_dev = device_get_parent(dev);

- mii = device_get_softc(sc->mii_dev);

+ mii = ma->mii_data;

LIST_INSERT_HEAD(&mii->mii_phys, sc, mii_list);

sc->mii_inst = mii->mii_instance;

diff --git a/sys/dev/mii/tdkphy.c b/sys/dev/mii/tdkphy.c
index e05f2c055482..626b4277b975 100644
--- a/sys/dev/mii/tdkphy.c
+++ b/sys/dev/mii/tdkphy.c

@@ -108,7 +108,7 @@ tdkphy_attach(device_t dev)

sc = device_get_softc(dev);

ma = device_get_ivars(dev);

sc->mii_dev = device_get_parent(dev);

- mii = device_get_softc(sc->mii_dev);

+ mii = ma->mii_data;

LIST_INSERT_HEAD(&mii->mii_phys, sc, mii_list);

if (bootverbose)

diff --git a/sys/dev/mii/truephy.c b/sys/dev/mii/truephy.c
index 069b2a0638bf..93ea449a350e 100644
--- a/sys/dev/mii/truephy.c
+++ b/sys/dev/mii/truephy.c

@@ -150,7 +150,7 @@ truephy_attach(device_t dev)

if (sc->mii_anegticks == 0)

sc->mii_anegticks = MII_ANEGTICKS;

sc->mii_dev = device_get_parent(dev);

- mii = device_get_softc(sc->mii_dev);

+ mii = ma->mii_data;

LIST_INSERT_HEAD(&mii->mii_phys, sc, mii_list);

sc->mii_inst = mii->mii_instance;

diff --git a/sys/dev/mii/ukphy.c b/sys/dev/mii/ukphy.c
index f82ef2d4227e..b4811bd4769c 100644
--- a/sys/dev/mii/ukphy.c
+++ b/sys/dev/mii/ukphy.c

@@ -122,7 +122,7 @@ ukphy_attach(device_t dev)

sc = device_get_softc(dev);

ma = device_get_ivars(dev);

sc->mii_dev = device_get_parent(dev);

- mii = device_get_softc(sc->mii_dev);

+ mii = ma->mii_data;

LIST_INSERT_HEAD(&mii->mii_phys, sc, mii_list);

if (bootverbose)

diff --git a/sys/dev/mii/xmphy.c b/sys/dev/mii/xmphy.c
index 7beaae7c55cb..278b1507c768 100644
--- a/sys/dev/mii/xmphy.c
+++ b/sys/dev/mii/xmphy.c

@@ -107,7 +107,7 @@ xmphy_attach(device_t dev)

sc = device_get_softc(dev);

ma = device_get_ivars(dev);

sc->mii_dev = device_get_parent(dev);

- mii = device_get_softc(sc->mii_dev);

+ mii = ma->mii_data;

LIST_INSERT_HEAD(&mii->mii_phys, sc, mii_list);

sc->mii_inst = mii->mii_instance;