sfc: Remove static PHY data and enumerations

[net-next-2.6.git] / drivers / net / sfc / selftest.c

diff --git a/drivers/net/sfc/selftest.c b/drivers/net/sfc/selftest.c
index 9a240536debc1ec5c8350a60c2b5d8035c115bf1..16258d83b703f05e7f16a6a96b005bc9af2985c2 100644 (file)
--- 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)
        }
 
        if (EFX_IS10G(efx)) {
-               rc = efx_mdio_check_mmds(efx, efx->phy_op->mmds, 0);
+               rc = efx_mdio_check_mmds(efx, efx->mdio.mmds, 0);
                if (rc)
                        goto out;
        }
@@ -253,9 +253,6 @@ static int efx_test_phy(struct efx_nic *efx, struct efx_self_tests *tests,
        if (!efx->phy_op->run_tests)
                return 0;
 
-       EFX_BUG_ON_PARANOID(efx->phy_op->num_tests == 0 ||
-                           efx->phy_op->num_tests > EFX_MAX_PHY_TESTS);
-
        mutex_lock(&efx->mac_lock);
        rc = efx->phy_op->run_tests(efx, tests->phy, flags);
        mutex_unlock(&efx->mac_lock);