[dpdk-dev] [PATCH 13/19] igb: Convert PMD to use new PMD_INIT macro

[Neil Horman]

Use the PMD init macro to allow separation of the pmd from the rest of the dpdk

Signed-off-by: Neil Horman <nhorman at tuxdriver.com>
---
 examples/dpdk_qat/main.c          | 8 +++-----
 lib/librte_ether/rte_ethdev.c     | 4 ----
 lib/librte_ether/rte_ethdev.h     | 9 ---------
 lib/librte_pmd_e1000/igb_ethdev.c | 5 ++++-
 4 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/examples/dpdk_qat/main.c b/examples/dpdk_qat/main.c
index cdf6832..39f7df7 100644
--- a/examples/dpdk_qat/main.c
+++ b/examples/dpdk_qat/main.c
@@ -696,11 +696,9 @@ MAIN(int argc, char **argv)
 	if (ret < 0)
 		return -1;
 
-	/* init driver */
-#ifdef RTE_LIBRTE_IGB_PMD
-	if (rte_igb_pmd_init() < 0)
-		rte_panic("Cannot init igb pmd\n");
-#endif
+	/* init drivers */
+	if (rte_pmd_init_all() < 0)
+		rte_panic("PMD driver failed to init\n");
 #ifdef RTE_LIBRTE_IXGBE_PMD
 	if (rte_ixgbe_pmd_init() < 0)
 		rte_panic("Cannot init ixgbe pmd\n");
diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c
index a9efe73..6e85451 100644
--- a/lib/librte_ether/rte_ethdev.c
+++ b/lib/librte_ether/rte_ethdev.c
@@ -147,10 +147,6 @@ int rte_pmd_init_all(void)
 	struct pmd_entry *entry;
 
 #ifdef RTE_LIBRTE_IGB_PMD
-        if ((ret = rte_igb_pmd_init()) != 0) {
-                RTE_LOG(ERR, PMD, "Cannot init igb PMD\n");
-                return (ret);
-        }
         if ((ret = rte_igbvf_pmd_init()) != 0) {
                 RTE_LOG(ERR, PMD, "Cannot init igbvf PMD\n");
                 return (ret);
diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h
index bf2ded4..d5f2922 100644
--- a/lib/librte_ether/rte_ethdev.h
+++ b/lib/librte_ether/rte_ethdev.h
@@ -1317,15 +1317,6 @@ extern void rte_eth_driver_register(struct eth_driver *eth_drv);
 
 /**
  * The initialization function of the driver for
- * Intel(r) IGB Gigabit Ethernet Controller devices.
- * This function is invoked once at EAL start time.
- * @return
- *   0 on success
- */
-extern int rte_igb_pmd_init(void);
-
-/**
- * The initialization function of the driver for
  * Intel(r) EM Gigabit Ethernet Controller devices.
  * This function is invoked once at EAL start time.
  * @return
diff --git a/lib/librte_pmd_e1000/igb_ethdev.c b/lib/librte_pmd_e1000/igb_ethdev.c
index 673b4de..df615e0 100644
--- a/lib/librte_pmd_e1000/igb_ethdev.c
+++ b/lib/librte_pmd_e1000/igb_ethdev.c
@@ -51,6 +51,7 @@
 #include <rte_eal.h>
 #include <rte_atomic.h>
 #include <rte_malloc.h>
+#include <rte_pmd.h>
 
 #include "e1000_logs.h"
 #include "e1000/e1000_api.h"
@@ -619,7 +620,7 @@ static struct eth_driver rte_igbvf_pmd = {
 	.dev_private_size = sizeof(struct e1000_adapter),
 };
 
-int
+static int
 rte_igb_pmd_init(void)
 {
 	rte_eth_driver_register(&rte_igb_pmd);
@@ -2182,3 +2183,5 @@ eth_igb_rss_reta_query(struct rte_eth_dev *dev,
  
 	return 0;
 }
+
+PMD_INIT(rte_igb_pmd_init);
-- 
1.8.3.1