From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from wes1-so1.wedos.net (wes1-so1.wedos.net [46.28.106.15]) by dpdk.org (Postfix) with ESMTP id 97D68ADB5 for ; Fri, 8 Jul 2016 21:10:36 +0200 (CEST) Received: from pcviktorin.fit.vutbr.cz (pcviktorin.fit.vutbr.cz [147.229.13.147]) by wes1-so1.wedos.net (Postfix) with ESMTPSA id 3rmPG43DHpzCCJ; Fri, 8 Jul 2016 21:10:36 +0200 (CEST) From: Jan Viktorin To: dev@dpdk.org Cc: Jan Viktorin , Shreyansh Jain , thomas.monjalon@6wind.com, David Marchand Date: Fri, 8 Jul 2016 21:09:37 +0200 Message-Id: <20160708190945.24225-8-viktorin@rehivetech.com> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20160708190945.24225-1-viktorin@rehivetech.com> References: <20160708190945.24225-1-viktorin@rehivetech.com> Subject: [dpdk-dev] [PATCH v1 07/15] eal: get rid of pmd_type X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Jul 2016 19:10:36 -0000 There is no need to determine a PMD type any more. The PMD_VDEV devices has its own list of drivers. And all PMD_PDEV are PCI devices using a different way of registering themselfs. Signed-off-by: Jan Viktorin --- drivers/crypto/aesni_gcm/aesni_gcm_pmd.c | 1 - drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c | 1 - drivers/crypto/kasumi/rte_kasumi_pmd.c | 1 - drivers/crypto/null/null_crypto_pmd.c | 1 - drivers/crypto/snow3g/rte_snow3g_pmd.c | 1 - drivers/net/af_packet/rte_eth_af_packet.c | 1 - drivers/net/bonding/rte_eth_bond_pmd.c | 1 - drivers/net/mpipe/mpipe_tilegx.c | 2 -- drivers/net/null/rte_eth_null.c | 1 - drivers/net/pcap/rte_eth_pcap.c | 1 - drivers/net/ring/rte_eth_ring.c | 1 - drivers/net/vhost/rte_eth_vhost.c | 1 - drivers/net/xenvirt/rte_eth_xenvirt.c | 1 - lib/librte_eal/common/include/rte_dev.h | 9 --------- 14 files changed, 23 deletions(-) diff --git a/drivers/crypto/aesni_gcm/aesni_gcm_pmd.c b/drivers/crypto/aesni_gcm/aesni_gcm_pmd.c index 6e45293..dfa1001 100644 --- a/drivers/crypto/aesni_gcm/aesni_gcm_pmd.c +++ b/drivers/crypto/aesni_gcm/aesni_gcm_pmd.c @@ -517,7 +517,6 @@ aesni_gcm_uninit(const char *name) static struct rte_vdev_driver aesni_gcm_pmd_drv = { .driver = { .name = CRYPTODEV_NAME_AESNI_GCM_PMD, - .type = PMD_VDEV, }, .init = aesni_gcm_init, .uninit = aesni_gcm_uninit, diff --git a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c index e7cdcfd..3265f83 100644 --- a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c +++ b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c @@ -717,7 +717,6 @@ cryptodev_aesni_mb_uninit(const char *name) static struct rte_vdev_driver cryptodev_aesni_mb_pmd_drv = { .driver = { .name = CRYPTODEV_NAME_AESNI_MB_PMD, - .type = PMD_VDEV, }, .init = cryptodev_aesni_mb_init, .uninit = cryptodev_aesni_mb_uninit, diff --git a/drivers/crypto/kasumi/rte_kasumi_pmd.c b/drivers/crypto/kasumi/rte_kasumi_pmd.c index 792184a..c39b0a1 100644 --- a/drivers/crypto/kasumi/rte_kasumi_pmd.c +++ b/drivers/crypto/kasumi/rte_kasumi_pmd.c @@ -651,7 +651,6 @@ cryptodev_kasumi_uninit(const char *name) static struct rte_vdev_driver cryptodev_kasumi_pmd_drv = { .driver = { .name = CRYPTODEV_NAME_KASUMI_PMD, - .type = PMD_VDEV, }, .init = cryptodev_kasumi_init, .uninit = cryptodev_kasumi_uninit, diff --git a/drivers/crypto/null/null_crypto_pmd.c b/drivers/crypto/null/null_crypto_pmd.c index 5250e3f..5ad8b86 100644 --- a/drivers/crypto/null/null_crypto_pmd.c +++ b/drivers/crypto/null/null_crypto_pmd.c @@ -271,7 +271,6 @@ cryptodev_null_uninit(const char *name) static struct rte_vdev_driver cryptodev_null_pmd_drv = { .driver = { .name = CRYPTODEV_NAME_NULL_PMD, - .type = PMD_VDEV, }, .init = cryptodev_null_init, .uninit = cryptodev_null_uninit, diff --git a/drivers/crypto/snow3g/rte_snow3g_pmd.c b/drivers/crypto/snow3g/rte_snow3g_pmd.c index 6dc9a2e..9fc5c64 100644 --- a/drivers/crypto/snow3g/rte_snow3g_pmd.c +++ b/drivers/crypto/snow3g/rte_snow3g_pmd.c @@ -642,7 +642,6 @@ cryptodev_snow3g_uninit(const char *name) static struct rte_vdev_driver cryptodev_snow3g_pmd_drv = { .driver = { .name = CRYPTODEV_NAME_SNOW3G_PMD, - .type = PMD_VDEV, }, .init = cryptodev_snow3g_init, .uninit = cryptodev_snow3g_uninit, diff --git a/drivers/net/af_packet/rte_eth_af_packet.c b/drivers/net/af_packet/rte_eth_af_packet.c index 66aaf99..9d0c6d3 100644 --- a/drivers/net/af_packet/rte_eth_af_packet.c +++ b/drivers/net/af_packet/rte_eth_af_packet.c @@ -874,7 +874,6 @@ rte_pmd_af_packet_devuninit(const char *name) static struct rte_vdev_driver pmd_af_packet_drv = { .driver = { .name = "eth_af_packet", - .type = PMD_VDEV, }, .init = rte_pmd_af_packet_devinit, .uninit = rte_pmd_af_packet_devuninit, diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c index 801a481..a3846e6 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c @@ -2507,7 +2507,6 @@ bond_ethdev_configure(struct rte_eth_dev *dev) static struct rte_vdev_driver bond_drv = { .driver = { .name = "eth_bond", - .type = PMD_VDEV, }, .init = bond_init, .uninit = bond_uninit, diff --git a/drivers/net/mpipe/mpipe_tilegx.c b/drivers/net/mpipe/mpipe_tilegx.c index fe7c0c6..9d5cc6d 100644 --- a/drivers/net/mpipe/mpipe_tilegx.c +++ b/drivers/net/mpipe/mpipe_tilegx.c @@ -1626,7 +1626,6 @@ rte_pmd_mpipe_devinit(const char *ifname, static struct rte_vdev_driver pmd_mpipe_xgbe_drv = { .driver = { .name = "xgbe", - .type = PMD_VDEV, }, .init = rte_pmd_mpipe_devinit, }; @@ -1634,7 +1633,6 @@ static struct rte_vdev_driver pmd_mpipe_xgbe_drv = { static struct rte_vdev_driver pmd_mpipe_gbe_drv = { .driver = { .name = "gbe", - .type = PMD_VDEV, }, .init = rte_pmd_mpipe_devinit, }; diff --git a/drivers/net/null/rte_eth_null.c b/drivers/net/null/rte_eth_null.c index 85c4526..39eb5d0 100644 --- a/drivers/net/null/rte_eth_null.c +++ b/drivers/net/null/rte_eth_null.c @@ -685,7 +685,6 @@ rte_pmd_null_devuninit(const char *name) static struct rte_vdev_driver pmd_null_drv = { .driver = { .name = "eth_null", - .type = PMD_VDEV, }, .init = rte_pmd_null_devinit, .uninit = rte_pmd_null_devuninit, diff --git a/drivers/net/pcap/rte_eth_pcap.c b/drivers/net/pcap/rte_eth_pcap.c index 934b77f..be5a21a 100644 --- a/drivers/net/pcap/rte_eth_pcap.c +++ b/drivers/net/pcap/rte_eth_pcap.c @@ -1086,7 +1086,6 @@ rte_pmd_pcap_devuninit(const char *name) static struct rte_vdev_driver pmd_pcap_drv = { .driver = { .name = "eth_pcap", - .type = PMD_VDEV, }, .init = rte_pmd_pcap_devinit, .uninit = rte_pmd_pcap_devuninit, diff --git a/drivers/net/ring/rte_eth_ring.c b/drivers/net/ring/rte_eth_ring.c index 95245be..cdb2efd 100644 --- a/drivers/net/ring/rte_eth_ring.c +++ b/drivers/net/ring/rte_eth_ring.c @@ -626,7 +626,6 @@ rte_pmd_ring_devuninit(const char *name) static struct rte_vdev_driver pmd_ring_drv = { .driver = { .name = "eth_ring", - .type = PMD_VDEV, }, .init = rte_pmd_ring_devinit, .uninit = rte_pmd_ring_devuninit, diff --git a/drivers/net/vhost/rte_eth_vhost.c b/drivers/net/vhost/rte_eth_vhost.c index 1c8b33d..9a1c4ac 100644 --- a/drivers/net/vhost/rte_eth_vhost.c +++ b/drivers/net/vhost/rte_eth_vhost.c @@ -920,7 +920,6 @@ rte_pmd_vhost_devuninit(const char *name) static struct rte_vdev_driver pmd_vhost_drv = { .driver = { .name = "eth_vhost", - .type = PMD_VDEV, }, .init = rte_pmd_vhost_devinit, .uninit = rte_pmd_vhost_devuninit, diff --git a/drivers/net/xenvirt/rte_eth_xenvirt.c b/drivers/net/xenvirt/rte_eth_xenvirt.c index b97246b..38d7a68 100644 --- a/drivers/net/xenvirt/rte_eth_xenvirt.c +++ b/drivers/net/xenvirt/rte_eth_xenvirt.c @@ -759,7 +759,6 @@ rte_pmd_xenvirt_devuninit(const char *name) static struct rte_vdev_driver pmd_xenvirt_drv = { .driver = { .name = "eth_xenvirt", - .type = PMD_VDEV, }, .init = rte_pmd_xenvirt_devinit, .uninit = rte_pmd_xenvirt_devuninit, diff --git a/lib/librte_eal/common/include/rte_dev.h b/lib/librte_eal/common/include/rte_dev.h index 2fa85f7..225257e 100644 --- a/lib/librte_eal/common/include/rte_dev.h +++ b/lib/librte_eal/common/include/rte_dev.h @@ -105,19 +105,10 @@ rte_pmd_debug_trace(const char *func_name, const char *fmt, ...) TAILQ_HEAD(rte_driver_list, rte_driver); /** - * Driver type enumeration - */ -enum pmd_type { - PMD_VDEV = 0, - PMD_PDEV = 1, -}; - -/** * A structure describing a device driver. */ struct rte_driver { TAILQ_ENTRY(rte_driver) next; /**< Next in list. */ - enum pmd_type type; /**< PMD Driver type */ const char *name; /**< Driver name. */ }; -- 2.9.0