net/bnxt: consolidate template table processing

[dpdk.git] / drivers / net / atlantic / atl_ethdev.c

diff --git a/drivers/net/atlantic/atl_ethdev.c b/drivers/net/atlantic/atl_ethdev.c
index 540b106..2217511 100644 (file)
--- a/drivers/net/atlantic/atl_ethdev.c
+++ b/drivers/net/atlantic/atl_ethdev.c
@@ -15,14 +15,12 @@
 #include "hw_atl/hw_atl_b0_internal.h"
 
 static int eth_atl_dev_init(struct rte_eth_dev *eth_dev);
-static int eth_atl_dev_uninit(struct rte_eth_dev *eth_dev);
-
 static int  atl_dev_configure(struct rte_eth_dev *dev);
 static int  atl_dev_start(struct rte_eth_dev *dev);
 static void atl_dev_stop(struct rte_eth_dev *dev);
 static int  atl_dev_set_link_up(struct rte_eth_dev *dev);
 static int  atl_dev_set_link_down(struct rte_eth_dev *dev);
-static void atl_dev_close(struct rte_eth_dev *dev);
+static int  atl_dev_close(struct rte_eth_dev *dev);
 static int  atl_dev_reset(struct rte_eth_dev *dev);
 static int  atl_dev_promiscuous_enable(struct rte_eth_dev *dev);
 static int  atl_dev_promiscuous_disable(struct rte_eth_dev *dev);
@@ -442,40 +440,6 @@ eth_atl_dev_init(struct rte_eth_dev *eth_dev)
        return err;
 }
 
-static int
-eth_atl_dev_uninit(struct rte_eth_dev *eth_dev)
-{
-       struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);
-       struct rte_intr_handle *intr_handle = &pci_dev->intr_handle;
-       struct aq_hw_s *hw;
-
-       PMD_INIT_FUNC_TRACE();
-
-       if (rte_eal_process_type() != RTE_PROC_PRIMARY)
-               return -EPERM;
-
-       hw = ATL_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private);
-
-       if (hw->adapter_stopped == 0)
-               atl_dev_close(eth_dev);
-
-       eth_dev->dev_ops = NULL;
-       eth_dev->rx_pkt_burst = NULL;
-       eth_dev->tx_pkt_burst = NULL;
-
-       /* disable uio intr before callback unregister */
-       rte_intr_disable(intr_handle);
-       rte_intr_callback_unregister(intr_handle,
-                                    atl_dev_interrupt_handler, eth_dev);
-
-       rte_free(eth_dev->data->mac_addrs);
-       eth_dev->data->mac_addrs = NULL;
-
-       pthread_mutex_destroy(&hw->mbox_mutex);
-
-       return 0;
-}
-
 static int
 eth_atl_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
        struct rte_pci_device *pci_dev)
@@ -487,7 +451,7 @@ eth_atl_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
 static int
 eth_atl_pci_remove(struct rte_pci_device *pci_dev)
 {
-       return rte_eth_dev_pci_generic_remove(pci_dev, eth_atl_dev_uninit);
+       return rte_eth_dev_pci_generic_remove(pci_dev, atl_dev_close);
 }
 
 static int
@@ -719,14 +683,36 @@ atl_dev_set_link_down(struct rte_eth_dev *dev)
 /*
  * Reset and stop device.
  */
-static void
+static int
 atl_dev_close(struct rte_eth_dev *dev)
 {
+       struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev);
+       struct rte_intr_handle *intr_handle = &pci_dev->intr_handle;
+       struct aq_hw_s *hw;
+
        PMD_INIT_FUNC_TRACE();
 
+       if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+               return 0;
+
+       hw = ATL_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+
        atl_dev_stop(dev);
 
        atl_free_queues(dev);
+
+       dev->dev_ops = NULL;
+       dev->rx_pkt_burst = NULL;
+       dev->tx_pkt_burst = NULL;
+
+       /* disable uio intr before callback unregister */
+       rte_intr_disable(intr_handle);
+       rte_intr_callback_unregister(intr_handle,
+                                    atl_dev_interrupt_handler, dev);
+
+       pthread_mutex_destroy(&hw->mbox_mutex);
+
+       return 0;
 }
 
 static int
@@ -734,7 +720,7 @@ atl_dev_reset(struct rte_eth_dev *dev)
 {
        int ret;
 
-       ret = eth_atl_dev_uninit(dev);
+       ret = atl_dev_close(dev);
        if (ret)
                return ret;
 
@@ -1395,8 +1381,7 @@ atl_dev_interrupt_action(struct rte_eth_dev *dev,
        /* Notify userapp if link status changed */
        if (!atl_dev_link_update(dev, 0)) {
                atl_dev_link_status_print(dev);
-               _rte_eth_dev_callback_process(dev,
-                       RTE_ETH_EVENT_INTR_LSC, NULL);
+               rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_LSC, NULL);
        } else {
                if (hw->aq_fw_ops->send_macsec_req == NULL)
                        goto done;
@@ -1422,7 +1407,7 @@ atl_dev_interrupt_action(struct rte_eth_dev *dev,
                    resp.stats.egress_expired ||
                    resp.stats.ingress_expired) {
                        PMD_DRV_LOG(INFO, "RTE_ETH_EVENT_MACSEC");
-                       _rte_eth_dev_callback_process(dev,
+                       rte_eth_dev_callback_process(dev,
                                RTE_ETH_EVENT_MACSEC, NULL);
                }
        }