Commit f873866a authored by Thomas Falcon's avatar Thomas Falcon Committed by David S. Miller

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: default avatarThomas Falcon <tlfalcon@linux.vnet.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 46e371f0
...@@ -1162,7 +1162,7 @@ static int __ibmvnic_close(struct net_device *netdev) ...@@ -1162,7 +1162,7 @@ static int __ibmvnic_close(struct net_device *netdev)
if (adapter->tx_scrq) { if (adapter->tx_scrq) {
for (i = 0; i < adapter->req_tx_queues; i++) for (i = 0; i < adapter->req_tx_queues; i++)
if (adapter->tx_scrq[i]->irq) { if (adapter->tx_scrq[i]->irq) {
netdev_dbg(adapter->netdev, netdev_dbg(netdev,
"Disabling tx_scrq[%d] irq\n", i); "Disabling tx_scrq[%d] irq\n", i);
disable_irq(adapter->tx_scrq[i]->irq); disable_irq(adapter->tx_scrq[i]->irq);
} }
...@@ -1174,18 +1174,8 @@ static int __ibmvnic_close(struct net_device *netdev) ...@@ -1174,18 +1174,8 @@ static int __ibmvnic_close(struct net_device *netdev)
if (adapter->rx_scrq) { if (adapter->rx_scrq) {
for (i = 0; i < adapter->req_rx_queues; i++) { 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) { if (adapter->rx_scrq[i]->irq) {
netdev_dbg(adapter->netdev, netdev_dbg(netdev,
"Disabling rx_scrq[%d] irq\n", i); "Disabling rx_scrq[%d] irq\n", i);
disable_irq(adapter->rx_scrq[i]->irq); disable_irq(adapter->rx_scrq[i]->irq);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment