From 5fe63e39e85c05f49c9c4e4bb6d46b012481331a Mon Sep 17 00:00:00 2001
From: yongari <yongari@FreeBSD.org>
Date: Mon, 3 Jul 2006 02:53:40 +0000
Subject: Replace hard-coded magic constants to system defined constants
 (BUS_PROBE_DEFAULT, BUS_PROBE_GENERIC etc). There is no functional changes.

Reviewed by:	oleg, scottl
---
 sys/dev/mii/acphy.c    |  2 +-
 sys/dev/mii/amphy.c    |  2 +-
 sys/dev/mii/bmtphy.c   |  6 +++---
 sys/dev/mii/brgphy.c   | 24 ++++++++++++------------
 sys/dev/mii/ciphy.c    |  6 +++---
 sys/dev/mii/e1000phy.c |  2 +-
 sys/dev/mii/exphy.c    |  2 +-
 sys/dev/mii/inphy.c    | 10 +++++-----
 sys/dev/mii/lxtphy.c   |  2 +-
 sys/dev/mii/mlphy.c    |  2 +-
 sys/dev/mii/nsgphy.c   |  2 +-
 sys/dev/mii/nsphy.c    |  2 +-
 sys/dev/mii/pnaphy.c   |  2 +-
 sys/dev/mii/qsphy.c    |  2 +-
 sys/dev/mii/rgephy.c   |  2 +-
 sys/dev/mii/rlphy.c    |  4 ++--
 sys/dev/mii/ruephy.c   |  2 +-
 sys/dev/mii/tdkphy.c   |  4 ++--
 sys/dev/mii/tlphy.c    |  2 +-
 sys/dev/mii/ukphy.c    |  2 +-
 sys/dev/mii/xmphy.c    |  4 ++--
 21 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/sys/dev/mii/acphy.c b/sys/dev/mii/acphy.c
index 176e392..24af909 100644
--- a/sys/dev/mii/acphy.c
+++ b/sys/dev/mii/acphy.c
@@ -132,7 +132,7 @@ acphy_probe(device_t dev)
 	} else 
 		return (ENXIO);
 
-	return (0);
+	return (BUS_PROBE_DEFAULT);
 }
 
 static int
diff --git a/sys/dev/mii/amphy.c b/sys/dev/mii/amphy.c
index 78e5544..f50b0b7 100644
--- a/sys/dev/mii/amphy.c
+++ b/sys/dev/mii/amphy.c
@@ -100,7 +100,7 @@ amphy_probe(device_t dev)
 	else if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_xxDAVICOM)
 		device_set_desc(dev, MII_STR_xxDAVICOM_DM9101);
 
-	return(0);
+	return(BUS_PROBE_DEFAULT);
 }
 
 static int
diff --git a/sys/dev/mii/bmtphy.c b/sys/dev/mii/bmtphy.c
index b086c86..aa595c1 100644
--- a/sys/dev/mii/bmtphy.c
+++ b/sys/dev/mii/bmtphy.c
@@ -127,7 +127,7 @@ bmtphy_probe(device_t dev)
 	int	rval;
 
 	ma = device_get_ivars(dev);
-	rval = 0;
+	rval = BUS_PROBE_DEFAULT;
 
 	if (MII_OUI(ma->mii_id1, ma->mii_id2) != MII_OUI_BROADCOM)
 		return (ENXIO);
@@ -135,11 +135,11 @@ bmtphy_probe(device_t dev)
 	switch (MII_MODEL(ma->mii_id2)) {
 	case MII_MODEL_BROADCOM_3C905B:
 		device_set_desc(dev, MII_STR_BROADCOM_3C905B);
-		rval = -10;	/* Let exphy take precedence. */
+		rval = BUS_PROBE_LOW_PRIORITY;	/* Let exphy take precedence. */
 		break;
 	case MII_MODEL_BROADCOM_3C905C:
 		device_set_desc(dev, MII_STR_BROADCOM_3C905C);
-		rval = -10;	/* Let exphy take precedence. */
+		rval = BUS_PROBE_LOW_PRIORITY;	/* Let exphy take precedence. */
 		break;
 	case MII_MODEL_BROADCOM_BCM5201:
 		device_set_desc(dev, MII_STR_BROADCOM_BCM5201);
diff --git a/sys/dev/mii/brgphy.c b/sys/dev/mii/brgphy.c
index 9a46746..26230e5 100644
--- a/sys/dev/mii/brgphy.c
+++ b/sys/dev/mii/brgphy.c
@@ -108,73 +108,73 @@ brgphy_probe(device_t dev)
 	if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_xxBROADCOM &&
 	    MII_MODEL(ma->mii_id2) == MII_MODEL_xxBROADCOM_BCM5400) {
 		device_set_desc(dev, MII_STR_xxBROADCOM_BCM5400);
-		return(0);
+		return(BUS_PROBE_DEFAULT);
 	}
 
 	if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_xxBROADCOM &&
 	    MII_MODEL(ma->mii_id2) == MII_MODEL_xxBROADCOM_BCM5401) {
 		device_set_desc(dev, MII_STR_xxBROADCOM_BCM5401);
-		return(0);
+		return(BUS_PROBE_DEFAULT);
 	}
 
 	if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_xxBROADCOM &&
 	    MII_MODEL(ma->mii_id2) == MII_MODEL_xxBROADCOM_BCM5411) {
 		device_set_desc(dev, MII_STR_xxBROADCOM_BCM5411);
-		return(0);
+		return(BUS_PROBE_DEFAULT);
 	}
 
 	if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_xxBROADCOM &&
 	    MII_MODEL(ma->mii_id2) == MII_MODEL_xxBROADCOM_BCM5701) {
 		device_set_desc(dev, MII_STR_xxBROADCOM_BCM5701);
-		return(0);
+		return(BUS_PROBE_DEFAULT);
 	}
 
 	if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_xxBROADCOM &&
 	    MII_MODEL(ma->mii_id2) == MII_MODEL_xxBROADCOM_BCM5703) {
 		device_set_desc(dev, MII_STR_xxBROADCOM_BCM5703);
-		return(0);
+		return(BUS_PROBE_DEFAULT);
 	}
 
 	if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_xxBROADCOM &&
 	    MII_MODEL(ma->mii_id2) == MII_MODEL_xxBROADCOM_BCM5704) {
 		device_set_desc(dev, MII_STR_xxBROADCOM_BCM5704);
-		return(0);
+		return(BUS_PROBE_DEFAULT);
 	}
 
 	if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_xxBROADCOM &&
 	    MII_MODEL(ma->mii_id2) == MII_MODEL_xxBROADCOM_BCM5705) {
 		device_set_desc(dev, MII_STR_xxBROADCOM_BCM5705);
-		return(0);
+		return(BUS_PROBE_DEFAULT);
 	}
 
 	if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_xxBROADCOM &&
 	    MII_MODEL(ma->mii_id2) == MII_MODEL_xxBROADCOM_BCM5750) {
 		device_set_desc(dev, MII_STR_xxBROADCOM_BCM5750);
-		return(0);
+		return(BUS_PROBE_DEFAULT);
 	}
 
 	if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_xxBROADCOM &&
 	    MII_MODEL(ma->mii_id2) == MII_MODEL_xxBROADCOM_BCM5714) {
 		device_set_desc(dev, MII_STR_xxBROADCOM_BCM5714);
-		return(0);
+		return(BUS_PROBE_DEFAULT);
 	}
 
 	if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_xxBROADCOM &&
 	    MII_MODEL(ma->mii_id2) == MII_MODEL_xxBROADCOM_BCM5780) {
 		device_set_desc(dev, MII_STR_xxBROADCOM_BCM5780);
-		return (0);
+		return (BUS_PROBE_DEFAULT);
 	}
 
 	if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_xxBROADCOM &&
 	    MII_MODEL(ma->mii_id2) == MII_MODEL_xxBROADCOM_BCM5706C) {
 		device_set_desc(dev, MII_STR_xxBROADCOM_BCM5706C);
-		return(0);
+		return(BUS_PROBE_DEFAULT);
 	}
 
 	if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_xxBROADCOM &&
 	    MII_MODEL(ma->mii_id2) == MII_MODEL_xxBROADCOM_BCM5708C) {
 		device_set_desc(dev, MII_STR_xxBROADCOM_BCM5708C);
-		return(0);
+		return(BUS_PROBE_DEFAULT);
 	}
 
 	return(ENXIO);
diff --git a/sys/dev/mii/ciphy.c b/sys/dev/mii/ciphy.c
index f2ad07e..086452f 100644
--- a/sys/dev/mii/ciphy.c
+++ b/sys/dev/mii/ciphy.c
@@ -100,19 +100,19 @@ ciphy_probe(device_t dev)
 	if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_CICADA &&
 	    MII_MODEL(ma->mii_id2) == MII_MODEL_CICADA_CS8201) {
 		device_set_desc(dev, MII_STR_CICADA_CS8201);
-		return(0);
+		return(BUS_PROBE_DEFAULT);
 	}
 
 	if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_CICADA &&
 	    MII_MODEL(ma->mii_id2) == MII_MODEL_CICADA_CS8201A) {
 		device_set_desc(dev, MII_STR_CICADA_CS8201A);
-		return(0);
+		return(BUS_PROBE_DEFAULT);
 	}
 
 	if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_CICADA &&
 	    MII_MODEL(ma->mii_id2) == MII_MODEL_CICADA_CS8201B) {
 		device_set_desc(dev, MII_STR_CICADA_CS8201B);
-		return(0);
+		return(BUS_PROBE_DEFAULT);
 	}
 
 	return(ENXIO);
diff --git a/sys/dev/mii/e1000phy.c b/sys/dev/mii/e1000phy.c
index b085ed2..f020471 100644
--- a/sys/dev/mii/e1000phy.c
+++ b/sys/dev/mii/e1000phy.c
@@ -102,7 +102,7 @@ e1000phy_probe(device_t	dev)
 	}
 
 	device_set_desc(dev, MII_STR_MARVELL_E1000);
-	return 0;
+	return BUS_PROBE_DEFAULT;
 }
 
 static int
diff --git a/sys/dev/mii/exphy.c b/sys/dev/mii/exphy.c
index 61121a6..bd52e84 100644
--- a/sys/dev/mii/exphy.c
+++ b/sys/dev/mii/exphy.c
@@ -143,7 +143,7 @@ exphy_probe(device_t dev)
 	else
 		device_set_desc(dev, MII_STR_BROADCOM_3C905C);
 
-	return (0);
+	return (BUS_PROBE_DEFAULT);
 }
 
 static int
diff --git a/sys/dev/mii/inphy.c b/sys/dev/mii/inphy.c
index b2a3d81..fae1730 100644
--- a/sys/dev/mii/inphy.c
+++ b/sys/dev/mii/inphy.c
@@ -89,23 +89,23 @@ inphy_probe(device_t dev)
 	if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_xxINTEL &&
 	    MII_MODEL(ma->mii_id2) == MII_MODEL_xxINTEL_I82553AB) {
 		device_set_desc(dev, MII_STR_xxINTEL_I82553AB);
-		return (0);
+		return (BUS_PROBE_DEFAULT);
 	}
 
 	if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_INTEL) {
 		switch (MII_MODEL(ma->mii_id2)) {
 		case MII_MODEL_INTEL_I82555:
 			device_set_desc(dev, MII_STR_INTEL_I82555);
-			return (0);
+			return (BUS_PROBE_DEFAULT);
 		case MII_MODEL_INTEL_I82553C:
 			device_set_desc(dev, MII_STR_INTEL_I82553C);
-			return (0);
+			return (BUS_PROBE_DEFAULT);
 		case MII_MODEL_INTEL_I82562EM:
 			device_set_desc(dev, MII_STR_INTEL_I82562EM);
-			return (0);
+			return (BUS_PROBE_DEFAULT);
 		case MII_MODEL_INTEL_I82562ET:
 			device_set_desc(dev, MII_STR_INTEL_I82562ET);
-			return (0);
+			return (BUS_PROBE_DEFAULT);
 		}
 	}
 
diff --git a/sys/dev/mii/lxtphy.c b/sys/dev/mii/lxtphy.c
index a5b6186..164889c 100644
--- a/sys/dev/mii/lxtphy.c
+++ b/sys/dev/mii/lxtphy.c
@@ -134,7 +134,7 @@ lxtphy_probe(device_t dev)
 	} else
 		return (ENXIO);
 
-	return (0);
+	return (BUS_PROBE_DEFAULT);
 }
 
 static int
diff --git a/sys/dev/mii/mlphy.c b/sys/dev/mii/mlphy.c
index 9b26933..05269f6 100644
--- a/sys/dev/mii/mlphy.c
+++ b/sys/dev/mii/mlphy.c
@@ -127,7 +127,7 @@ mlphy_probe(dev)
 
 	device_set_desc(dev, "Micro Linear 6692 media interface");
 
-	return (0);
+	return (BUS_PROBE_DEFAULT);
 }
 
 static int
diff --git a/sys/dev/mii/nsgphy.c b/sys/dev/mii/nsgphy.c
index 51b290f..f14be53 100644
--- a/sys/dev/mii/nsgphy.c
+++ b/sys/dev/mii/nsgphy.c
@@ -115,7 +115,7 @@ nsgphy_probe(device_t dev)
 	mpd = mii_phy_match(ma, gphyters);
 	if (mpd != NULL) {
 		device_set_desc(dev, mpd->mpd_name);
-		return(0);
+		return(BUS_PROBE_DEFAULT);
 	}
 
 	return(ENXIO);
diff --git a/sys/dev/mii/nsphy.c b/sys/dev/mii/nsphy.c
index b965ed8..d6c4726 100644
--- a/sys/dev/mii/nsphy.c
+++ b/sys/dev/mii/nsphy.c
@@ -131,7 +131,7 @@ nsphy_probe(device_t dev)
 	} else 
 		return (ENXIO);
 
-	return (0);
+	return (BUS_PROBE_DEFAULT);
 }
 
 static int
diff --git a/sys/dev/mii/pnaphy.c b/sys/dev/mii/pnaphy.c
index cd69488..e7db926 100644
--- a/sys/dev/mii/pnaphy.c
+++ b/sys/dev/mii/pnaphy.c
@@ -96,7 +96,7 @@ pnaphy_probe(device_t dev)
 	if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_AMD &&
 	    MII_MODEL(ma->mii_id2) == MII_MODEL_AMD_79c978) {
 		device_set_desc(dev, MII_STR_AMD_79c978);
-		return(0);
+		return(BUS_PROBE_DEFAULT);
 	}
 
 	return(ENXIO);
diff --git a/sys/dev/mii/qsphy.c b/sys/dev/mii/qsphy.c
index ad06072..bdd5d68 100644
--- a/sys/dev/mii/qsphy.c
+++ b/sys/dev/mii/qsphy.c
@@ -133,7 +133,7 @@ qsphy_probe(device_t dev)
 	} else 
 		return (ENXIO);
 
-	return (0);
+	return (BUS_PROBE_DEFAULT);
 }
 
 static int
diff --git a/sys/dev/mii/rgephy.c b/sys/dev/mii/rgephy.c
index 24196ff..3d36865 100644
--- a/sys/dev/mii/rgephy.c
+++ b/sys/dev/mii/rgephy.c
@@ -100,7 +100,7 @@ rgephy_probe(device_t dev)
 	if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_xxREALTEK &&
 	    MII_MODEL(ma->mii_id2) == MII_MODEL_xxREALTEK_RTL8169S) {
 		device_set_desc(dev, MII_STR_xxREALTEK_RTL8169S);
-		return(0);
+		return(BUS_PROBE_DEFAULT);
 	}
 
 	return(ENXIO);
diff --git a/sys/dev/mii/rlphy.c b/sys/dev/mii/rlphy.c
index cef10c6..39662c6 100644
--- a/sys/dev/mii/rlphy.c
+++ b/sys/dev/mii/rlphy.c
@@ -95,7 +95,7 @@ rlphy_probe(device_t dev)
 	if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_REALTEK &&
 	    MII_MODEL(ma->mii_id2) == MII_MODEL_REALTEK_RTL8201L) {
 		device_set_desc(dev, MII_STR_REALTEK_RTL8201L);
-		return(0);
+		return(BUS_PROBE_DEFAULT);
 	}
 
 	/*
@@ -115,7 +115,7 @@ rlphy_probe(device_t dev)
 
 	device_set_desc(dev, "RealTek internal media interface");
 
-	return (0);
+	return (BUS_PROBE_DEFAULT);
 }
 
 static int
diff --git a/sys/dev/mii/ruephy.c b/sys/dev/mii/ruephy.c
index 282dcdd..c0240b2 100644
--- a/sys/dev/mii/ruephy.c
+++ b/sys/dev/mii/ruephy.c
@@ -104,7 +104,7 @@ ruephy_probe(device_t dev)
 
 	device_set_desc(dev, "RealTek RTL8150 internal media interface");
 
-	return (0);
+	return (BUS_PROBE_DEFAULT);
 }
 
 static int
diff --git a/sys/dev/mii/tdkphy.c b/sys/dev/mii/tdkphy.c
index 88bf006..1ac7e6f 100644
--- a/sys/dev/mii/tdkphy.c
+++ b/sys/dev/mii/tdkphy.c
@@ -66,7 +66,7 @@ __FBSDID("$FreeBSD$");
 #if 0
 #if !defined(lint)
 static const char rcsid[] =
-  "$Id: tdkphy.c,v 1.3 2000/10/14 06:20:56 jon Exp $";
+  "$Id: tdkphy.c,v 1.18 2006/05/16 14:36:28 phk Exp $";
 #endif
 #endif
 
@@ -105,7 +105,7 @@ tdkphy_probe(device_t dev)
 		return (ENXIO);
 
 	device_set_desc(dev, MII_STR_TDK_78Q2120);
-	return (0);
+	return (BUS_PROBE_DEFAULT);
 }
 
 static int
diff --git a/sys/dev/mii/tlphy.c b/sys/dev/mii/tlphy.c
index 7baf700..d489537 100644
--- a/sys/dev/mii/tlphy.c
+++ b/sys/dev/mii/tlphy.c
@@ -140,7 +140,7 @@ tlphy_probe(device_t dev)
 
 	device_set_desc(dev, MII_STR_xxTI_TLAN10T);
 
-	return (0);
+	return (BUS_PROBE_DEFAULT);
 }
 
 static int
diff --git a/sys/dev/mii/ukphy.c b/sys/dev/mii/ukphy.c
index 6c078cc..c6b0707 100644
--- a/sys/dev/mii/ukphy.c
+++ b/sys/dev/mii/ukphy.c
@@ -121,7 +121,7 @@ ukphy_probe(device_t dev)
 	 * We know something is here, so always match at a low priority.
 	 */
 	device_set_desc(dev, "Generic IEEE 802.3u media interface");
-	return (-100);
+	return (BUS_PROBE_GENERIC);
 }
 
 static int
diff --git a/sys/dev/mii/xmphy.c b/sys/dev/mii/xmphy.c
index b6bf7f1..c071b1f 100644
--- a/sys/dev/mii/xmphy.c
+++ b/sys/dev/mii/xmphy.c
@@ -93,13 +93,13 @@ xmphy_probe(device_t dev)
 	if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_xxXAQTI &&
 	    MII_MODEL(ma->mii_id2) == MII_MODEL_XAQTI_XMACII) {
 		device_set_desc(dev, MII_STR_XAQTI_XMACII);
-		return(0);
+		return(BUS_PROBE_DEFAULT);
 	}
 
 	if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_JATO &&
 	    MII_MODEL(ma->mii_id2) == MII_MODEL_JATO_BASEX) {
 		device_set_desc(dev, MII_STR_JATO_BASEX);
-		return(0);
+		return(BUS_PROBE_DEFAULT);
 	}
 
 	return(ENXIO);
-- 
cgit v1.1