From owner-svn-src-head@FreeBSD.ORG  Mon Sep 27 20:31:04 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3AD37106566C;
	Mon, 27 Sep 2010 20:31:04 +0000 (UTC)
	(envelope-from marius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 28C3E8FC0A;
	Mon, 27 Sep 2010 20:31:04 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o8RKV41u049050;
	Mon, 27 Sep 2010 20:31:04 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o8RKV3AT049016;
	Mon, 27 Sep 2010 20:31:03 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201009272031.o8RKV3AT049016@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Mon, 27 Sep 2010 20:31:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r213229 - in head/sys/dev: dc mii
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Sep 2010 20:31:04 -0000

Author: marius
Date: Mon Sep 27 20:31:03 2010
New Revision: 213229
URL: http://svn.freebsd.org/changeset/base/213229

Log:
  Use the mii_data provided via mii_attach_args and mii_pdata respectively
  instead of reaching out for the softc of the parent.

Modified:
  head/sys/dev/dc/dcphy.c
  head/sys/dev/dc/pnphy.c
  head/sys/dev/mii/acphy.c
  head/sys/dev/mii/amphy.c
  head/sys/dev/mii/atphy.c
  head/sys/dev/mii/axphy.c
  head/sys/dev/mii/bmtphy.c
  head/sys/dev/mii/brgphy.c
  head/sys/dev/mii/ciphy.c
  head/sys/dev/mii/e1000phy.c
  head/sys/dev/mii/exphy.c
  head/sys/dev/mii/gentbi.c
  head/sys/dev/mii/icsphy.c
  head/sys/dev/mii/inphy.c
  head/sys/dev/mii/ip1000phy.c
  head/sys/dev/mii/jmphy.c
  head/sys/dev/mii/lxtphy.c
  head/sys/dev/mii/mii_physubr.c
  head/sys/dev/mii/mlphy.c
  head/sys/dev/mii/nsgphy.c
  head/sys/dev/mii/nsphy.c
  head/sys/dev/mii/nsphyter.c
  head/sys/dev/mii/pnaphy.c
  head/sys/dev/mii/qsphy.c
  head/sys/dev/mii/rgephy.c
  head/sys/dev/mii/rlphy.c
  head/sys/dev/mii/rlswitch.c
  head/sys/dev/mii/ruephy.c
  head/sys/dev/mii/smcphy.c
  head/sys/dev/mii/tdkphy.c
  head/sys/dev/mii/truephy.c
  head/sys/dev/mii/ukphy.c
  head/sys/dev/mii/xmphy.c

Modified: head/sys/dev/dc/dcphy.c
==============================================================================
--- head/sys/dev/dc/dcphy.c	Mon Sep 27 20:12:57 2010	(r213228)
+++ head/sys/dev/dc/dcphy.c	Mon Sep 27 20:31:03 2010	(r213229)
@@ -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;

Modified: head/sys/dev/dc/pnphy.c
==============================================================================
--- head/sys/dev/dc/pnphy.c	Mon Sep 27 20:12:57 2010	(r213228)
+++ head/sys/dev/dc/pnphy.c	Mon Sep 27 20:31:03 2010	(r213229)
@@ -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;

Modified: head/sys/dev/mii/acphy.c
==============================================================================
--- head/sys/dev/mii/acphy.c	Mon Sep 27 20:12:57 2010	(r213228)
+++ head/sys/dev/mii/acphy.c	Mon Sep 27 20:31:03 2010	(r213229)
@@ -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;

Modified: head/sys/dev/mii/amphy.c
==============================================================================
--- head/sys/dev/mii/amphy.c	Mon Sep 27 20:12:57 2010	(r213228)
+++ head/sys/dev/mii/amphy.c	Mon Sep 27 20:31:03 2010	(r213229)
@@ -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;

Modified: head/sys/dev/mii/atphy.c
==============================================================================
--- head/sys/dev/mii/atphy.c	Mon Sep 27 20:12:57 2010	(r213228)
+++ head/sys/dev/mii/atphy.c	Mon Sep 27 20:31:03 2010	(r213229)
@@ -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;

Modified: head/sys/dev/mii/axphy.c
==============================================================================
--- head/sys/dev/mii/axphy.c	Mon Sep 27 20:12:57 2010	(r213228)
+++ head/sys/dev/mii/axphy.c	Mon Sep 27 20:31:03 2010	(r213229)
@@ -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;

Modified: head/sys/dev/mii/bmtphy.c
==============================================================================
--- head/sys/dev/mii/bmtphy.c	Mon Sep 27 20:12:57 2010	(r213228)
+++ head/sys/dev/mii/bmtphy.c	Mon Sep 27 20:31:03 2010	(r213229)
@@ -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;

Modified: head/sys/dev/mii/brgphy.c
==============================================================================
--- head/sys/dev/mii/brgphy.c	Mon Sep 27 20:12:57 2010	(r213228)
+++ head/sys/dev/mii/brgphy.c	Mon Sep 27 20:31:03 2010	(r213229)
@@ -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 */

Modified: head/sys/dev/mii/ciphy.c
==============================================================================
--- head/sys/dev/mii/ciphy.c	Mon Sep 27 20:12:57 2010	(r213228)
+++ head/sys/dev/mii/ciphy.c	Mon Sep 27 20:31:03 2010	(r213229)
@@ -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;

Modified: head/sys/dev/mii/e1000phy.c
==============================================================================
--- head/sys/dev/mii/e1000phy.c	Mon Sep 27 20:12:57 2010	(r213228)
+++ head/sys/dev/mii/e1000phy.c	Mon Sep 27 20:31:03 2010	(r213229)
@@ -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;

Modified: head/sys/dev/mii/exphy.c
==============================================================================
--- head/sys/dev/mii/exphy.c	Mon Sep 27 20:12:57 2010	(r213228)
+++ head/sys/dev/mii/exphy.c	Mon Sep 27 20:31:03 2010	(r213229)
@@ -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

Modified: head/sys/dev/mii/gentbi.c
==============================================================================
--- head/sys/dev/mii/gentbi.c	Mon Sep 27 20:12:57 2010	(r213228)
+++ head/sys/dev/mii/gentbi.c	Mon Sep 27 20:31:03 2010	(r213229)
@@ -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)

Modified: head/sys/dev/mii/icsphy.c
==============================================================================
--- head/sys/dev/mii/icsphy.c	Mon Sep 27 20:12:57 2010	(r213228)
+++ head/sys/dev/mii/icsphy.c	Mon Sep 27 20:31:03 2010	(r213229)
@@ -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;

Modified: head/sys/dev/mii/inphy.c
==============================================================================
--- head/sys/dev/mii/inphy.c	Mon Sep 27 20:12:57 2010	(r213228)
+++ head/sys/dev/mii/inphy.c	Mon Sep 27 20:31:03 2010	(r213229)
@@ -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;

Modified: head/sys/dev/mii/ip1000phy.c
==============================================================================
--- head/sys/dev/mii/ip1000phy.c	Mon Sep 27 20:12:57 2010	(r213228)
+++ head/sys/dev/mii/ip1000phy.c	Mon Sep 27 20:31:03 2010	(r213229)
@@ -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;

Modified: head/sys/dev/mii/jmphy.c
==============================================================================
--- head/sys/dev/mii/jmphy.c	Mon Sep 27 20:12:57 2010	(r213228)
+++ head/sys/dev/mii/jmphy.c	Mon Sep 27 20:31:03 2010	(r213229)
@@ -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;

Modified: head/sys/dev/mii/lxtphy.c
==============================================================================
--- head/sys/dev/mii/lxtphy.c	Mon Sep 27 20:12:57 2010	(r213228)
+++ head/sys/dev/mii/lxtphy.c	Mon Sep 27 20:31:03 2010	(r213229)
@@ -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;

Modified: head/sys/dev/mii/mii_physubr.c
==============================================================================
--- head/sys/dev/mii/mii_physubr.c	Mon Sep 27 20:12:57 2010	(r213228)
+++ head/sys/dev/mii/mii_physubr.c	Mon Sep 27 20:31:03 2010	(r213229)
@@ -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;

Modified: head/sys/dev/mii/mlphy.c
==============================================================================
--- head/sys/dev/mii/mlphy.c	Mon Sep 27 20:12:57 2010	(r213228)
+++ head/sys/dev/mii/mlphy.c	Mon Sep 27 20:31:03 2010	(r213229)
@@ -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;

Modified: head/sys/dev/mii/nsgphy.c
==============================================================================
--- head/sys/dev/mii/nsgphy.c	Mon Sep 27 20:12:57 2010	(r213228)
+++ head/sys/dev/mii/nsgphy.c	Mon Sep 27 20:31:03 2010	(r213229)
@@ -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;

Modified: head/sys/dev/mii/nsphy.c
==============================================================================
--- head/sys/dev/mii/nsphy.c	Mon Sep 27 20:12:57 2010	(r213228)
+++ head/sys/dev/mii/nsphy.c	Mon Sep 27 20:31:03 2010	(r213229)
@@ -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;

Modified: head/sys/dev/mii/nsphyter.c
==============================================================================
--- head/sys/dev/mii/nsphyter.c	Mon Sep 27 20:12:57 2010	(r213228)
+++ head/sys/dev/mii/nsphyter.c	Mon Sep 27 20:31:03 2010	(r213229)
@@ -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;

Modified: head/sys/dev/mii/pnaphy.c
==============================================================================
--- head/sys/dev/mii/pnaphy.c	Mon Sep 27 20:12:57 2010	(r213228)
+++ head/sys/dev/mii/pnaphy.c	Mon Sep 27 20:31:03 2010	(r213229)
@@ -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;

Modified: head/sys/dev/mii/qsphy.c
==============================================================================
--- head/sys/dev/mii/qsphy.c	Mon Sep 27 20:12:57 2010	(r213228)
+++ head/sys/dev/mii/qsphy.c	Mon Sep 27 20:31:03 2010	(r213229)
@@ -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;

Modified: head/sys/dev/mii/rgephy.c
==============================================================================
--- head/sys/dev/mii/rgephy.c	Mon Sep 27 20:12:57 2010	(r213228)
+++ head/sys/dev/mii/rgephy.c	Mon Sep 27 20:31:03 2010	(r213229)
@@ -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;

Modified: head/sys/dev/mii/rlphy.c
==============================================================================
--- head/sys/dev/mii/rlphy.c	Mon Sep 27 20:12:57 2010	(r213228)
+++ head/sys/dev/mii/rlphy.c	Mon Sep 27 20:31:03 2010	(r213229)
@@ -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

Modified: head/sys/dev/mii/rlswitch.c
==============================================================================
--- head/sys/dev/mii/rlswitch.c	Mon Sep 27 20:12:57 2010	(r213228)
+++ head/sys/dev/mii/rlswitch.c	Mon Sep 27 20:31:03 2010	(r213229)
@@ -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

Modified: head/sys/dev/mii/ruephy.c
==============================================================================
--- head/sys/dev/mii/ruephy.c	Mon Sep 27 20:12:57 2010	(r213228)
+++ head/sys/dev/mii/ruephy.c	Mon Sep 27 20:31:03 2010	(r213229)
@@ -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

Modified: head/sys/dev/mii/smcphy.c
==============================================================================
--- head/sys/dev/mii/smcphy.c	Mon Sep 27 20:12:57 2010	(r213228)
+++ head/sys/dev/mii/smcphy.c	Mon Sep 27 20:31:03 2010	(r213229)
@@ -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;

Modified: head/sys/dev/mii/tdkphy.c
==============================================================================
--- head/sys/dev/mii/tdkphy.c	Mon Sep 27 20:12:57 2010	(r213228)
+++ head/sys/dev/mii/tdkphy.c	Mon Sep 27 20:31:03 2010	(r213229)
@@ -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)

Modified: head/sys/dev/mii/truephy.c
==============================================================================
--- head/sys/dev/mii/truephy.c	Mon Sep 27 20:12:57 2010	(r213228)
+++ head/sys/dev/mii/truephy.c	Mon Sep 27 20:31:03 2010	(r213229)
@@ -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;

Modified: head/sys/dev/mii/ukphy.c
==============================================================================
--- head/sys/dev/mii/ukphy.c	Mon Sep 27 20:12:57 2010	(r213228)
+++ head/sys/dev/mii/ukphy.c	Mon Sep 27 20:31:03 2010	(r213229)
@@ -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)

Modified: head/sys/dev/mii/xmphy.c
==============================================================================
--- head/sys/dev/mii/xmphy.c	Mon Sep 27 20:12:57 2010	(r213228)
+++ head/sys/dev/mii/xmphy.c	Mon Sep 27 20:31:03 2010	(r213229)
@@ -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;