From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <nhorman@tuxdriver.com>
Received: from smtp.tuxdriver.com (charlotte.tuxdriver.com [70.61.120.58])
by dpdk.org (Postfix) with ESMTP id 8056269A4
for <dev@dpdk.org>; Thu, 10 Apr 2014 22:49:28 +0200 (CEST)
Received: from hmsreliant.think-freely.org
([2001:470:8:a08:7aac:c0ff:fec2:933b] helo=localhost)
by smtp.tuxdriver.com with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.63)
(envelope-from <nhorman@tuxdriver.com>)
id 1WYLw7-0004Pj-Am; Thu, 10 Apr 2014 16:51:05 -0400
From: Neil Horman <nhorman@tuxdriver.com>
To: dev@dpdk.org
Date: Thu, 10 Apr 2014 16:50:03 -0400
Message-Id: <1397163009-29950-13-git-send-email-nhorman@tuxdriver.com>
X-Mailer: git-send-email 1.8.3.1
In-Reply-To: <1397163009-29950-1-git-send-email-nhorman@tuxdriver.com>
References: <1397162846-28912-1-git-send-email-nhorman@tuxdriver.com>
<1397163009-29950-1-git-send-email-nhorman@tuxdriver.com>
X-Spam-Score: -2.9 (--)
X-Spam-Status: No
Subject: [dpdk-dev] [PATCH 13/19] igb: Convert PMD to use new PMD_INIT macro
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: patches and discussions about DPDK <dev.dpdk.org>
List-Unsubscribe: <http://dpdk.org/ml/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://dpdk.org/ml/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <http://dpdk.org/ml/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Thu, 10 Apr 2014 20:49:28 -0000
Use the PMD init macro to allow separation of the pmd from the rest of the dpdk
Signed-off-by: Neil Horman <nhorman@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