From patchwork Fri Sep 1 08:06:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrien Mazarguil X-Patchwork-Id: 28205 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 9C9767D0A; Fri, 1 Sep 2017 10:07:35 +0200 (CEST) Received: from mail-wm0-f48.google.com (mail-wm0-f48.google.com [74.125.82.48]) by dpdk.org (Postfix) with ESMTP id D7A7C7D01 for ; Fri, 1 Sep 2017 10:07:32 +0200 (CEST) Received: by mail-wm0-f48.google.com with SMTP id f127so3658964wmf.1 for ; Fri, 01 Sep 2017 01:07:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=3A2X4d8hsLsuHe78tPDTWkeXqUm+Gq0jcVTKoDSkVGI=; b=Ku3RKxjGjbIpt6vbwVMJOh3jYNZqeubqtZs4Rc8Fy77sOGYZXf/02Y8bXq6FsJWSuY 39tDUqpoK/6xRPWhLjUvh0alqiGbZqpw4pXcr2DIVymlZi8kf9DZaZJVGXfpnfA+LvjS wexWvkoLYBqxMlzpVjPF5NjNBaDIzdlcQBp12MZy9T8KJl2xzD/tVi3EueCoYbsvFT5h hMPAfBaUaoTI0yd5+NzzgDFgEQTyc4q7X6DWedbaazd6aIOtoum+Di7Aimb5o/JbfLnO bfUUjYuwNgw9XEvQPqUZb72MnOTFE3ihmOJsImWCKEFCSCmiyqoVSuHru/e+GOVzJpNq nzhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=3A2X4d8hsLsuHe78tPDTWkeXqUm+Gq0jcVTKoDSkVGI=; b=IaCgVm5YFMZAQq10LiNIhZ6tRVtEhejonCpH3KS4WC90ixrO0PSsUjAEmJyJrCyivj 7nI8bW4jLiJ8LeBAnRXPcOEIHgcevR+kBcfDoovwZ65+UFWqAUfu04Us1KWFQrAf0nf5 HctShIrIWPjsfWYGX/nLSe67LdF7HpwFnA1eMe2tBBaMwdUpMcw+8MxtCbW44gagQDIf Ep2a9arkjOgX/4ku1bw/h8oXoifcfekv13Q29AFus6EeuSIGPTaC01VU3+3HfsvAsHIG h4QGure8u1XnP2fBiOeXPJQ/Y/ihBerdvMMaXxzmxkdsN7wlozXYJpDySAM/J/fp3EeX Yy1Q== X-Gm-Message-State: AHPjjUh5GWTZ1LKUCjBEdMabslHhT7P9KJQGclMLHcNRYLvI/wzKIvqi 0qwqIAWUZDIKkPFg+Y4= X-Google-Smtp-Source: ADKCNb5ryxjlFeByQE2V9I/Z97Uj80Uookq80umPhrUv+9iY3kyt2Aze3dYXcOQ61WbqP2fVnQZeHw== X-Received: by 10.28.180.4 with SMTP id d4mr624699wmf.172.1504253252318; Fri, 01 Sep 2017 01:07:32 -0700 (PDT) Received: from 6wind.com (host.78.145.23.62.rev.coltfrance.com. [62.23.145.78]) by smtp.gmail.com with ESMTPSA id p105sm1497200wrc.64.2017.09.01.01.07.31 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 01 Sep 2017 01:07:31 -0700 (PDT) From: Adrien Mazarguil To: dev@dpdk.org Date: Fri, 1 Sep 2017 10:06:21 +0200 Message-Id: <82c5374a4c15bdc12abe97ec3c95f7459c96195b.1504252977.git.adrien.mazarguil@6wind.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: References: Subject: [dpdk-dev] [PATCH v2 06/51] net/mlx4: remove useless code X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Less code makes refactoring easier. No impact on functionality. Signed-off-by: Adrien Mazarguil --- drivers/net/mlx4/mlx4.c | 17 +---------------- drivers/net/mlx4/mlx4.h | 12 ------------ 2 files changed, 1 insertion(+), 28 deletions(-) diff --git a/drivers/net/mlx4/mlx4.c b/drivers/net/mlx4/mlx4.c index 6f8d328..cb07a53 100644 --- a/drivers/net/mlx4/mlx4.c +++ b/drivers/net/mlx4/mlx4.c @@ -69,13 +69,13 @@ #include #include #include -#include #include #include #include #include #include #include +#include /* Generated configuration header. */ #include "mlx4_autoconf.h" @@ -4649,10 +4649,6 @@ mlx4_link_update(struct rte_eth_dev *dev, int wait_to_complete) return -1; } -static int -mlx4_ibv_device_to_pci_addr(const struct ibv_device *device, - struct rte_pci_addr *pci_addr); - /** * DPDK callback to change the MTU. * @@ -4998,10 +4994,6 @@ mlx4_dev_filter_ctrl(struct rte_eth_dev *dev, return -EINVAL; *(const void **)arg = &mlx4_flow_ops; return 0; - case RTE_ETH_FILTER_FDIR: - DEBUG("%p: filter type FDIR is not supported by this PMD", - (void *)dev); - break; default: ERROR("%p: filter type (%d) not supported", (void *)dev, filter_type); @@ -5024,22 +5016,15 @@ static const struct eth_dev_ops mlx4_dev_ops = { .link_update = mlx4_link_update, .stats_get = mlx4_stats_get, .stats_reset = mlx4_stats_reset, - .queue_stats_mapping_set = NULL, .dev_infos_get = mlx4_dev_infos_get, .dev_supported_ptypes_get = mlx4_dev_supported_ptypes_get, .vlan_filter_set = mlx4_vlan_filter_set, - .vlan_tpid_set = NULL, - .vlan_strip_queue_set = NULL, - .vlan_offload_set = NULL, .rx_queue_setup = mlx4_rx_queue_setup, .tx_queue_setup = mlx4_tx_queue_setup, .rx_queue_release = mlx4_rx_queue_release, .tx_queue_release = mlx4_tx_queue_release, - .dev_led_on = NULL, - .dev_led_off = NULL, .flow_ctrl_get = mlx4_dev_get_flow_ctrl, .flow_ctrl_set = mlx4_dev_set_flow_ctrl, - .priority_flow_ctrl_set = NULL, .mac_addr_remove = mlx4_mac_addr_remove, .mac_addr_add = mlx4_mac_addr_add, .mac_addr_set = mlx4_mac_addr_set, diff --git a/drivers/net/mlx4/mlx4.h b/drivers/net/mlx4/mlx4.h index a12d1fa..702f9c9 100644 --- a/drivers/net/mlx4/mlx4.h +++ b/drivers/net/mlx4/mlx4.h @@ -34,7 +34,6 @@ #ifndef RTE_PMD_MLX4_H_ #define RTE_PMD_MLX4_H_ -#include #include #include @@ -150,17 +149,6 @@ enum { /* Number of elements in array. */ #define elemof(a) (sizeof(a) / sizeof((a)[0])) -/* Cast pointer p to structure member m to its parent structure of type t. */ -#define containerof(p, t, m) ((t *)((uint8_t *)(p) - offsetof(t, m))) - -/* Branch prediction helpers. */ -#ifndef likely -#define likely(c) __builtin_expect(!!(c), 1) -#endif -#ifndef unlikely -#define unlikely(c) __builtin_expect(!!(c), 0) -#endif - /* Debugging */ #ifndef NDEBUG #include