diff options
-rw-r--r-- | drivers/net/ethernet/broadcom/genet/bcmgenet.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c index 620021e8365a..546d8623d8eb 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c | |||
@@ -2173,10 +2173,13 @@ static int bcmgenet_dma_teardown(struct bcmgenet_priv *priv) | |||
2173 | return ret; | 2173 | return ret; |
2174 | } | 2174 | } |
2175 | 2175 | ||
2176 | static void __bcmgenet_fini_dma(struct bcmgenet_priv *priv) | 2176 | static void bcmgenet_fini_dma(struct bcmgenet_priv *priv) |
2177 | { | 2177 | { |
2178 | int i; | 2178 | int i; |
2179 | 2179 | ||
2180 | bcmgenet_fini_rx_napi(priv); | ||
2181 | bcmgenet_fini_tx_napi(priv); | ||
2182 | |||
2180 | /* disable DMA */ | 2183 | /* disable DMA */ |
2181 | bcmgenet_dma_teardown(priv); | 2184 | bcmgenet_dma_teardown(priv); |
2182 | 2185 | ||
@@ -2192,14 +2195,6 @@ static void __bcmgenet_fini_dma(struct bcmgenet_priv *priv) | |||
2192 | kfree(priv->tx_cbs); | 2195 | kfree(priv->tx_cbs); |
2193 | } | 2196 | } |
2194 | 2197 | ||
2195 | static void bcmgenet_fini_dma(struct bcmgenet_priv *priv) | ||
2196 | { | ||
2197 | bcmgenet_fini_rx_napi(priv); | ||
2198 | bcmgenet_fini_tx_napi(priv); | ||
2199 | |||
2200 | __bcmgenet_fini_dma(priv); | ||
2201 | } | ||
2202 | |||
2203 | /* init_edma: Initialize DMA control register */ | 2198 | /* init_edma: Initialize DMA control register */ |
2204 | static int bcmgenet_init_dma(struct bcmgenet_priv *priv) | 2199 | static int bcmgenet_init_dma(struct bcmgenet_priv *priv) |
2205 | { | 2200 | { |