aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/sfc/selftest.c
diff options
context:
space:
mode:
authorBen Hutchings <bhutchings@solarflare.com>2009-11-29 10:08:55 -0500
committerDavid S. Miller <davem@davemloft.net>2009-11-29 20:23:53 -0500
commitc1c4f453b61463df4df16f7aa5782fc0cfe05b9e (patch)
treea72b533294500e7f19ab1f67142b732471df53cb /drivers/net/sfc/selftest.c
parente58f69f4082f60076885798fae8f3a17ea713bf6 (diff)
sfc: Remove static PHY data and enumerations
New NICs have firmware managing the PHY, and we will discover the PHY capabilities at run-time. Replace the static data with probe() and test_name() operations. Signed-off-by: Ben Hutchings <bhutchings@solarflare.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/sfc/selftest.c')
-rw-r--r--drivers/net/sfc/selftest.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/sfc/selftest.c b/drivers/net/sfc/selftest.c
index 9a240536debc..16258d83b703 100644
--- a/drivers/net/sfc/selftest.c
+++ b/drivers/net/sfc/selftest.c
@@ -100,7 +100,7 @@ static int efx_test_mdio(struct efx_nic *efx, struct efx_self_tests *tests)
100 } 100 }
101 101
102 if (EFX_IS10G(efx)) { 102 if (EFX_IS10G(efx)) {
103 rc = efx_mdio_check_mmds(efx, efx->phy_op->mmds, 0); 103 rc = efx_mdio_check_mmds(efx, efx->mdio.mmds, 0);
104 if (rc) 104 if (rc)
105 goto out; 105 goto out;
106 } 106 }
@@ -253,9 +253,6 @@ static int efx_test_phy(struct efx_nic *efx, struct efx_self_tests *tests,
253 if (!efx->phy_op->run_tests) 253 if (!efx->phy_op->run_tests)
254 return 0; 254 return 0;
255 255
256 EFX_BUG_ON_PARANOID(efx->phy_op->num_tests == 0 ||
257 efx->phy_op->num_tests > EFX_MAX_PHY_TESTS);
258
259 mutex_lock(&efx->mac_lock); 256 mutex_lock(&efx->mac_lock);
260 rc = efx->phy_op->run_tests(efx, tests->phy, flags); 257 rc = efx->phy_op->run_tests(efx, tests->phy, flags);
261 mutex_unlock(&efx->mac_lock); 258 mutex_unlock(&efx->mac_lock);