Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3e1d7cd2 authored by Wang Chen's avatar Wang Chen Committed by David S. Miller
Browse files

e1000: e1000_adapter->polling_netdev is useless 



Commit bea3348e
"[NET]: Make NAPI polling independent of struct net_device objects."
made NAPI polling to be independent of net_device.
So e1000_adapter->polling_netdev is no longer used.
Kill it.

Signed-off-by: default avatarWang Chen <wangchen@cn.fujitsu.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a4d2f34b

drivers/net/e1000/e1000.h

+0 −1
Original line number Diff line number Diff line
@@ -284,7 +284,6 @@ struct e1000_adapter { 
			     int cleaned_count);

	struct e1000_rx_ring *rx_ring;      /* One per active queue */

	struct napi_struct napi;

	struct net_device *polling_netdev;  /* One per active queue */



	int num_tx_queues;

	int num_rx_queues;

drivers/net/e1000/e1000_main.c

+1 −26
Original line number Diff line number Diff line
@@ -1242,12 +1242,8 @@ static int __devinit e1000_probe(struct pci_dev *pdev, 
	if (hw->flash_address)

		iounmap(hw->flash_address);

err_flashmap:

	for (i = 0; i < adapter->num_rx_queues; i++)

		dev_put(&adapter->polling_netdev[i]);



	kfree(adapter->tx_ring);

	kfree(adapter->rx_ring);

	kfree(adapter->polling_netdev);

err_sw_init:

	iounmap(hw->hw_addr);

err_ioremap:
@@ -1275,7 +1271,6 @@ static void __devexit e1000_remove(struct pci_dev *pdev) 
	struct net_device *netdev = pci_get_drvdata(pdev);

	struct e1000_adapter *adapter = netdev_priv(netdev);

	struct e1000_hw *hw = &adapter->hw;

	int i;



	cancel_work_sync(&adapter->reset_task);
@@ -1285,9 +1280,6 @@ static void __devexit e1000_remove(struct pci_dev *pdev) 
	 * would have already happened in close and is redundant. */

	e1000_release_hw_control(adapter);



	for (i = 0; i < adapter->num_rx_queues; i++)

		dev_put(&adapter->polling_netdev[i]);



	unregister_netdev(netdev);



	if (!e1000_check_phy_reset_block(hw))
@@ -1295,7 +1287,6 @@ static void __devexit e1000_remove(struct pci_dev *pdev) 


	kfree(adapter->tx_ring);

	kfree(adapter->rx_ring);

	kfree(adapter->polling_netdev);



	iounmap(hw->hw_addr);

	if (hw->flash_address)
@@ -1321,7 +1312,6 @@ static int __devinit e1000_sw_init(struct e1000_adapter *adapter) 
	struct e1000_hw *hw = &adapter->hw;

	struct net_device *netdev = adapter->netdev;

	struct pci_dev *pdev = adapter->pdev;

	int i;



	/* PCI config space info */
@@ -1378,11 +1368,6 @@ static int __devinit e1000_sw_init(struct e1000_adapter *adapter) 
		return -ENOMEM;

	}



	for (i = 0; i < adapter->num_rx_queues; i++) {

		adapter->polling_netdev[i].priv = adapter;

		dev_hold(&adapter->polling_netdev[i]);

		set_bit(__LINK_STATE_START, &adapter->polling_netdev[i].state);

	}

	spin_lock_init(&adapter->tx_queue_lock);



	/* Explicitly disable IRQ since the NIC can be in any state. */
@@ -1400,8 +1385,7 @@ static int __devinit e1000_sw_init(struct e1000_adapter *adapter) 
 * @adapter: board private structure to initialize

 *

 * We allocate one ring per queue at run-time since we don't know the

 * number of queues at compile-time.  The polling_netdev array is

 * intended for Multiqueue, but should work fine with a single queue.

 * number of queues at compile-time.

 **/



static int __devinit e1000_alloc_queues(struct e1000_adapter *adapter)
@@ -1418,15 +1402,6 @@ static int __devinit e1000_alloc_queues(struct e1000_adapter *adapter) 
		return -ENOMEM;

	}



	adapter->polling_netdev = kcalloc(adapter->num_rx_queues,

	                                  sizeof(struct net_device),

	                                  GFP_KERNEL);

	if (!adapter->polling_netdev) {

		kfree(adapter->tx_ring);

		kfree(adapter->rx_ring);

		return -ENOMEM;

	}



	return E1000_SUCCESS;

}