ibmvnic: Clean up device close

Remove some dead code now that RX pools are being cleaned. This
was included to wait until any pending RX queue interrupts are
processed, but NAPI polling should be disabled by this point.

Another minor change is to use the net device parameter for any
print functions instead of accessing it from the adapter structure.

Signed-off-by: Thomas Falcon <tlfalcon@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
index 765407179fdd6a5352d1ff970ff700e140096efb..fca0533d517f4c993747c53822de648bfa76d8fa 100644 (file)
--- a/drivers/net/ethernet/ibm/ibmvnic.c
+++ b/drivers/net/ethernet/ibm/ibmvnic.c
@@ -1162,7 +1162,7 @@ static int __ibmvnic_close(struct net_device *netdev)
        if (adapter->tx_scrq) {
                for (i = 0; i < adapter->req_tx_queues; i++)
                        if (adapter->tx_scrq[i]->irq) {
-                               netdev_dbg(adapter->netdev,
+                               netdev_dbg(netdev,
                                           "Disabling tx_scrq[%d] irq\n", i);
                                disable_irq(adapter->tx_scrq[i]->irq);
                        }
@@ -1174,18 +1174,8 @@ static int __ibmvnic_close(struct net_device *netdev)
 
        if (adapter->rx_scrq) {
                for (i = 0; i < adapter->req_rx_queues; i++) {
-                       int retries = 10;
-
-                       while (pending_scrq(adapter, adapter->rx_scrq[i])) {
-                               retries--;
-                               mdelay(100);
-
-                               if (retries == 0)
-                                       break;
-                       }
-
                        if (adapter->rx_scrq[i]->irq) {
-                               netdev_dbg(adapter->netdev,
+                               netdev_dbg(netdev,
                                           "Disabling rx_scrq[%d] irq\n", i);
                                disable_irq(adapter->rx_scrq[i]->irq);
                        }