1 files changed, 2 insertions, 13 deletions

diff --git a/drivers/net/ethernet/sfc/selftest.c b/drivers/net/ethernet/sfc/selftest.c
index 2069f51b2aa9..144bbff5a4ae 100644
--- a/drivers/net/ethernet/sfc/selftest.c
+++ b/drivers/net/ethernet/sfc/selftest.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * Driver for Solarflare Solarstorm network controllers and boards
+ * Driver for Solarflare network controllers and boards
  * Copyright 2005-2006 Fen Systems Ltd.
- * Copyright 2006-2010 Solarflare Communications Inc.
+ * Copyright 2006-2012 Solarflare Communications Inc.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
@@ -447,14 +447,7 @@ static int efx_begin_loopback(struct efx_tx_queue *tx_queue)
 static int efx_poll_loopback(struct efx_nic *efx)
 {
         struct efx_loopback_state *state = efx->loopback_selftest;
-        struct efx_channel *channel;
 
-        /* NAPI polling is not enabled, so process channels
-         * synchronously */
-        efx_for_each_channel(channel, efx) {
-                if (channel->work_pending)
-                        efx_process_channel_now(channel);
-        }
         return atomic_read(&state->rx_good) == state->packet_count;
 }
 
@@ -586,10 +579,6 @@ static int efx_wait_for_link(struct efx_nic *efx)
                         mutex_lock(&efx->mac_lock);
                         efx->type->monitor(efx);
                         mutex_unlock(&efx->mac_lock);
-                } else {
-                        struct efx_channel *channel = efx_get_channel(efx, 0);
-                        if (channel->work_pending)
-                                efx_process_channel_now(channel);
                 }
 
                 mutex_lock(&efx->mac_lock);