[dpdk-dev] [PATCH 15/19] em: move em/e1000 pmd to use PMD_INIT macro

[Neil Horman]

Modify the em pmd to use the PMD_INIT macro

Signed-off-by: Neil Horman <nhorman at tuxdriver.com>
---
 lib/librte_ether/rte_ethdev.c    | 7 -------
 lib/librte_ether/rte_ethdev.h    | 9 ---------
 lib/librte_pmd_e1000/em_ethdev.c | 5 ++++-
 mk/rte.app.mk                    | 2 ++
 4 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c
index 29eeef3..9a0a26a 100644
--- a/lib/librte_ether/rte_ethdev.c
+++ b/lib/librte_ether/rte_ethdev.c
@@ -146,13 +146,6 @@ int rte_pmd_init_all(void)
         int ret = -ENODEV;
        struct pmd_entry *entry;

-#ifdef RTE_LIBRTE_EM_PMD
-        if ((ret = rte_em_pmd_init()) != 0) {
-                RTE_LOG(ERR, PMD, "Cannot init em PMD\n");
-                return (ret);
-        }
-#endif /* RTE_LIBRTE_EM_PMD */
-
 #ifdef RTE_LIBRTE_IXGBE_PMD
         if ((ret = rte_ixgbe_pmd_init()) != 0) {
                 RTE_LOG(ERR, PMD, "Cannot init ixgbe PMD\n");
diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h
index 6cf7a03..d06308b 100644
--- a/lib/librte_ether/rte_ethdev.h
+++ b/lib/librte_ether/rte_ethdev.h
@@ -1316,15 +1316,6 @@ struct eth_driver {
 extern void rte_eth_driver_register(struct eth_driver *eth_drv);

 /**
- * The initialization function of the driver for
- * Intel(r) EM Gigabit Ethernet Controller devices.
- * This function is invoked once at EAL start time.
- * @return
- *   0 on success
- */
-extern int rte_em_pmd_init(void);
-
-/**
  * The initialization function of the driver for 10Gbps Intel IXGBE
  * Ethernet devices.
  * Invoked once at EAL start time.
diff --git a/lib/librte_pmd_e1000/em_ethdev.c b/lib/librte_pmd_e1000/em_ethdev.c
index d8c9a9b..accb7d7 100644
--- a/lib/librte_pmd_e1000/em_ethdev.c
+++ b/lib/librte_pmd_e1000/em_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"
@@ -285,7 +286,7 @@ static struct eth_driver rte_em_pmd = {
        .dev_private_size = sizeof(struct e1000_adapter),
 };

-int
+static int
 rte_em_pmd_init(void)
 {
        rte_eth_driver_register(&rte_em_pmd);
@@ -1433,3 +1434,5 @@ eth_em_rar_clear(struct rte_eth_dev *dev, uint32_t index)

        e1000_rar_set(hw, addr, index);
 }
+
+PMD_INIT(rte_em_pmd_init);
diff --git a/mk/rte.app.mk b/mk/rte.app.mk
index 41eab08..7435d97 100644
--- a/mk/rte.app.mk
+++ b/mk/rte.app.mk
@@ -73,9 +73,11 @@ LDLIBS += -lrte_ivshmem
 endif
 endif

+ifeq ($(RTE_BUILD_SHARED_LIB),n)
 ifeq ($(CONFIG_RTE_LIBRTE_E1000_PMD),y)
 LDLIBS += -lrte_pmd_e1000
 endif
+endif

 ifeq ($(CONFIG_RTE_LIBRTE_IXGBE_PMD),y)
 LDLIBS += -lrte_pmd_ixgbe
-- 
1.8.3.1