diff options
author | Ben Hutchings <bhutchings@solarflare.com> | 2009-11-25 11:11:45 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-11-26 18:59:40 -0500 |
commit | fe75820b99ff2de713de23252432f0f9d0ca1d35 (patch) | |
tree | ca03ef31a0e3a5352628038db11c5c61e9341da1 /drivers/net/sfc/efx.c | |
parent | 55edc6e6ff728681ebc10d418222740705376664 (diff) |
sfc: Move Falcon board/PHY/MAC monitoring code to falcon.c
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/sfc/efx.c')
-rw-r--r-- | drivers/net/sfc/efx.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/net/sfc/efx.c b/drivers/net/sfc/efx.c index 41ca5dbb4c44..d17cea9f4e88 100644 --- a/drivers/net/sfc/efx.c +++ b/drivers/net/sfc/efx.c | |||
@@ -1293,7 +1293,6 @@ static void efx_monitor(struct work_struct *data) | |||
1293 | { | 1293 | { |
1294 | struct efx_nic *efx = container_of(data, struct efx_nic, | 1294 | struct efx_nic *efx = container_of(data, struct efx_nic, |
1295 | monitor_work.work); | 1295 | monitor_work.work); |
1296 | int rc; | ||
1297 | 1296 | ||
1298 | EFX_TRACE(efx, "hardware monitor executing on CPU %d\n", | 1297 | EFX_TRACE(efx, "hardware monitor executing on CPU %d\n", |
1299 | raw_smp_processor_id()); | 1298 | raw_smp_processor_id()); |
@@ -1305,15 +1304,7 @@ static void efx_monitor(struct work_struct *data) | |||
1305 | goto out_requeue; | 1304 | goto out_requeue; |
1306 | if (!efx->port_enabled) | 1305 | if (!efx->port_enabled) |
1307 | goto out_unlock; | 1306 | goto out_unlock; |
1308 | rc = falcon_board(efx)->type->monitor(efx); | 1307 | falcon_monitor(efx); |
1309 | if (rc) { | ||
1310 | EFX_ERR(efx, "Board sensor %s; shutting down PHY\n", | ||
1311 | (rc == -ERANGE) ? "reported fault" : "failed"); | ||
1312 | efx->phy_mode |= PHY_MODE_LOW_POWER; | ||
1313 | falcon_sim_phy_event(efx); | ||
1314 | } | ||
1315 | efx->phy_op->poll(efx); | ||
1316 | efx->mac_op->poll(efx); | ||
1317 | 1308 | ||
1318 | out_unlock: | 1309 | out_unlock: |
1319 | mutex_unlock(&efx->mac_lock); | 1310 | mutex_unlock(&efx->mac_lock); |