diff options
author | Mark Einon <mark.einon@gmail.com> | 2011-10-23 05:22:44 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-10-23 05:35:11 -0400 |
commit | 5ad5be581ed19becd184731fd0e9711abc5650c6 (patch) | |
tree | 1e6475eedb20c87744ee4681b7600092ae1daf8e | |
parent | 16d8de3cc9484ccebab20331c03d1b6ba8636d76 (diff) |
staging: et131x: Remove redundant et131x_reset_recv() call
This call doesn't do anything useful - only warns on the receive list
being empty, so removed it.
Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/staging/et131x/et131x.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c index 8c557cfa0c1a..f521e3319aab 100644 --- a/drivers/staging/et131x/et131x.c +++ b/drivers/staging/et131x/et131x.c | |||
@@ -605,7 +605,6 @@ int32_t et131x_mii_write(struct et131x_adapter *adapter, | |||
605 | void et131x_rx_dma_memory_free(struct et131x_adapter *adapter); | 605 | void et131x_rx_dma_memory_free(struct et131x_adapter *adapter); |
606 | void et131x_rx_dma_disable(struct et131x_adapter *adapter); | 606 | void et131x_rx_dma_disable(struct et131x_adapter *adapter); |
607 | void et131x_rx_dma_enable(struct et131x_adapter *adapter); | 607 | void et131x_rx_dma_enable(struct et131x_adapter *adapter); |
608 | void et131x_reset_recv(struct et131x_adapter *adapter); | ||
609 | void et131x_init_send(struct et131x_adapter *adapter); | 608 | void et131x_init_send(struct et131x_adapter *adapter); |
610 | void et131x_tx_dma_enable(struct et131x_adapter *adapter); | 609 | void et131x_tx_dma_enable(struct et131x_adapter *adapter); |
611 | 610 | ||
@@ -1839,9 +1838,6 @@ void et1310_disable_phy_coma(struct et131x_adapter *adapter) | |||
1839 | /* Re-initialize the send structures */ | 1838 | /* Re-initialize the send structures */ |
1840 | et131x_init_send(adapter); | 1839 | et131x_init_send(adapter); |
1841 | 1840 | ||
1842 | /* Reset the RFD list and re-start RU */ | ||
1843 | et131x_reset_recv(adapter); | ||
1844 | |||
1845 | /* Bring the device back to the state it was during init prior to | 1841 | /* Bring the device back to the state it was during init prior to |
1846 | * autonegotiation being complete. This way, when we get the auto-neg | 1842 | * autonegotiation being complete. This way, when we get the auto-neg |
1847 | * complete interrupt, we can complete init by calling ConfigMacREGS2. | 1843 | * complete interrupt, we can complete init by calling ConfigMacREGS2. |
@@ -2882,17 +2878,6 @@ static struct rfd *nic_rx_pkts(struct et131x_adapter *adapter) | |||
2882 | } | 2878 | } |
2883 | 2879 | ||
2884 | /** | 2880 | /** |
2885 | * et131x_reset_recv - Reset the receive list | ||
2886 | * @adapter: pointer to our adapter | ||
2887 | * | ||
2888 | * Assumption, Rcv spinlock has been acquired. | ||
2889 | */ | ||
2890 | void et131x_reset_recv(struct et131x_adapter *adapter) | ||
2891 | { | ||
2892 | WARN_ON(list_empty(&adapter->rx_ring.recv_list)); | ||
2893 | } | ||
2894 | |||
2895 | /** | ||
2896 | * et131x_handle_recv_interrupt - Interrupt handler for receive processing | 2881 | * et131x_handle_recv_interrupt - Interrupt handler for receive processing |
2897 | * @adapter: pointer to our adapter | 2882 | * @adapter: pointer to our adapter |
2898 | * | 2883 | * |
@@ -4251,9 +4236,6 @@ static void et131x_adjust_link(struct net_device *netdev) | |||
4251 | /* Re-initialize the send structures */ | 4236 | /* Re-initialize the send structures */ |
4252 | et131x_init_send(adapter); | 4237 | et131x_init_send(adapter); |
4253 | 4238 | ||
4254 | /* Reset the RFD list and re-start RU */ | ||
4255 | et131x_reset_recv(adapter); | ||
4256 | |||
4257 | /* | 4239 | /* |
4258 | * Bring the device back to the state it was during | 4240 | * Bring the device back to the state it was during |
4259 | * init prior to autonegotiation being complete. This | 4241 | * init prior to autonegotiation being complete. This |