diff mbox series

[13/13] net/nfp: cleanup the include statement of PMD

Message ID 20230920113454.739356-14-chaoyong.he@corigine.com (mailing list archive)
State Accepted, archived
Delegated to: Ferruh Yigit
Headers
Series improve the modularization of NFP PMD |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/loongarch-compilation success Compilation OK
ci/loongarch-unit-testing success Unit Testing PASS
ci/Intel-compilation success Compilation OK
ci/intel-Testing success Testing PASS
ci/intel-Functional success Functional PASS
ci/iol-mellanox-Performance success Performance Testing PASS
ci/iol-broadcom-Performance success Performance Testing PASS
ci/iol-broadcom-Functional success Functional Testing PASS
ci/iol-intel-Performance success Performance Testing PASS
ci/iol-compile-amd64-testing success Testing PASS
ci/iol-intel-Functional success Functional Testing PASS
ci/iol-unit-arm64-testing success Testing PASS
ci/iol-compile-arm64-testing success Testing PASS
ci/iol-unit-amd64-testing success Testing PASS
ci/iol-sample-apps-testing success Testing PASS

Commit Message

Chaoyong He Sept. 20, 2023, 11:34 a.m. UTC 
  Remove the unneeded header file include statement of PMD source files,
also adjust the include statement of 'nfp_rxtx' and 'nfp_flower_cmsg'
module.

Signed-off-by: Chaoyong He <chaoyong.he@corigine.com>
---
 drivers/net/nfp/flower/nfp_flower.c           |  2 --
 drivers/net/nfp/flower/nfp_flower_cmsg.c      |  1 -
 drivers/net/nfp/flower/nfp_flower_cmsg.h      |  4 +--
 drivers/net/nfp/flower/nfp_flower_ctrl.c      |  2 --
 .../net/nfp/flower/nfp_flower_representor.c   |  2 --
 drivers/net/nfp/nfp_ethdev.c                  | 25 ++++---------------
 drivers/net/nfp/nfp_ethdev_vf.c               |  9 +++----
 drivers/net/nfp/nfp_flow.c                    |  1 -
 drivers/net/nfp/nfp_rxtx.c                    |  1 -
 9 files changed, 9 insertions(+), 38 deletions(-)
diff mbox series

Patch

diff --git a/drivers/net/nfp/flower/nfp_flower.c b/drivers/net/nfp/flower/nfp_flower.c
index bbcbb0060b..1e10b38120 100644
--- a/drivers/net/nfp/flower/nfp_flower.c
+++ b/drivers/net/nfp/flower/nfp_flower.c
@@ -14,10 +14,8 @@ 
 #include "../nfpcore/nfp_nsp.h"
 #include "../nfpcore/nfp_rtsym.h"
 #include "../nfp_cpp_bridge.h"
-#include "../nfp_flow.h"
 #include "../nfp_logs.h"
 #include "../nfp_mtr.h"
-#include "nfp_flower_cmsg.h"
 #include "nfp_flower_ctrl.h"
 #include "nfp_flower_representor.h"
 
diff --git a/drivers/net/nfp/flower/nfp_flower_cmsg.c b/drivers/net/nfp/flower/nfp_flower_cmsg.c
index 0b8feec05b..6b9532f5b6 100644
--- a/drivers/net/nfp/flower/nfp_flower_cmsg.c
+++ b/drivers/net/nfp/flower/nfp_flower_cmsg.c
@@ -6,7 +6,6 @@ 
 #include "nfp_flower_cmsg.h"
 
 #include "../nfpcore/nfp_nsp.h"
-#include "../nfp_flow.h"
 #include "../nfp_logs.h"
 #include "nfp_flower_ctrl.h"
 #include "nfp_flower_representor.h"
diff --git a/drivers/net/nfp/flower/nfp_flower_cmsg.h b/drivers/net/nfp/flower/nfp_flower_cmsg.h
index 3c2b279f40..9449760145 100644
--- a/drivers/net/nfp/flower/nfp_flower_cmsg.h
+++ b/drivers/net/nfp/flower/nfp_flower_cmsg.h
@@ -6,6 +6,7 @@ 
 #ifndef _NFP_CMSG_H_
 #define _NFP_CMSG_H_
 
+#include "../nfp_flow.h"
 #include "nfp_flower.h"
 
 struct nfp_flower_cmsg_hdr {
@@ -974,9 +975,6 @@  struct nfp_fl_act_meter {
 	rte_be32_t profile_id;
 };
 
-/* Forward declaration */
-struct nfp_fl_rule_metadata;
-
 int nfp_flower_cmsg_mac_repr(struct nfp_app_fw_flower *app_fw_flower);
 int nfp_flower_cmsg_repr_reify(struct nfp_app_fw_flower *app_fw_flower,
 		struct nfp_flower_representor *repr);
diff --git a/drivers/net/nfp/flower/nfp_flower_ctrl.c b/drivers/net/nfp/flower/nfp_flower_ctrl.c
index bdb042142a..c5282053cf 100644
--- a/drivers/net/nfp/flower/nfp_flower_ctrl.c
+++ b/drivers/net/nfp/flower/nfp_flower_ctrl.c
@@ -9,9 +9,7 @@ 
 
 #include "../nfd3/nfp_nfd3.h"
 #include "../nfdk/nfp_nfdk.h"
-#include "../nfp_flow.h"
 #include "../nfp_logs.h"
-#include "nfp_flower_cmsg.h"
 #include "nfp_flower_representor.h"
 #include "nfp_mtr.h"
 
diff --git a/drivers/net/nfp/flower/nfp_flower_representor.c b/drivers/net/nfp/flower/nfp_flower_representor.c
index d4df88fb73..55ca3e6db0 100644
--- a/drivers/net/nfp/flower/nfp_flower_representor.c
+++ b/drivers/net/nfp/flower/nfp_flower_representor.c
@@ -7,10 +7,8 @@ 
 
 #include "../nfd3/nfp_nfd3.h"
 #include "../nfpcore/nfp_nsp.h"
-#include "../nfp_flow.h"
 #include "../nfp_logs.h"
 #include "../nfp_mtr.h"
-#include "nfp_flower_cmsg.h"
 
 /*
  * enum nfp_repr_type - type of representor
diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c
index b2a2cd9ed8..241595be9d 100644
--- a/drivers/net/nfp/nfp_ethdev.c
+++ b/drivers/net/nfp/nfp_ethdev.c
@@ -5,35 +5,20 @@ 
  * Small portions derived from code Copyright(c) 2010-2015 Intel Corporation.
  */
 
-#include <rte_common.h>
-#include <ethdev_driver.h>
-#include <ethdev_pci.h>
-#include <dev_driver.h>
-#include <rte_ether.h>
-#include <rte_malloc.h>
-#include <rte_memzone.h>
-#include <rte_mempool.h>
-#include <rte_service_component.h>
+#include <eal_firmware.h>
 #include <rte_alarm.h>
-#include "eal_firmware.h"
 
+#include "flower/nfp_flower.h"
+#include "nfd3/nfp_nfd3.h"
+#include "nfdk/nfp_nfdk.h"
 #include "nfpcore/nfp_cpp.h"
-#include "nfpcore/nfp_nffw.h"
 #include "nfpcore/nfp_hwinfo.h"
-#include "nfpcore/nfp_mip.h"
 #include "nfpcore/nfp_rtsym.h"
 #include "nfpcore/nfp_nsp.h"
 #include "nfpcore/nfp6000_pcie.h"
 
-#include "nfp_common.h"
-#include "nfp_ctrl.h"
-#include "nfp_rxtx.h"
-#include "nfp_logs.h"
 #include "nfp_cpp_bridge.h"
-
-#include "nfd3/nfp_nfd3.h"
-#include "nfdk/nfp_nfdk.h"
-#include "flower/nfp_flower.h"
+#include "nfp_logs.h"
 
 static int
 nfp_net_pf_read_mac(struct nfp_app_fw_nic *app_fw_nic, int port)
diff --git a/drivers/net/nfp/nfp_ethdev_vf.c b/drivers/net/nfp/nfp_ethdev_vf.c
index 1a02a857ea..0c94fc51ad 100644
--- a/drivers/net/nfp/nfp_ethdev_vf.c
+++ b/drivers/net/nfp/nfp_ethdev_vf.c
@@ -7,15 +7,12 @@ 
 
 #include <rte_alarm.h>
 
-#include "nfpcore/nfp_mip.h"
-#include "nfpcore/nfp_rtsym.h"
+#include "nfd3/nfp_nfd3.h"
+#include "nfdk/nfp_nfdk.h"
+#include "nfpcore/nfp_cpp.h"
 
 #include "nfp_common.h"
-#include "nfp_ctrl.h"
-#include "nfp_rxtx.h"
 #include "nfp_logs.h"
-#include "nfd3/nfp_nfd3.h"
-#include "nfdk/nfp_nfdk.h"
 
 static void
 nfp_netvf_read_mac(struct nfp_net_hw *hw)
diff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c
index ff03bea6ce..aa286535f7 100644
--- a/drivers/net/nfp/nfp_flow.c
+++ b/drivers/net/nfp/nfp_flow.c
@@ -10,7 +10,6 @@ 
 #include <rte_jhash.h>
 #include <rte_malloc.h>
 
-#include "flower/nfp_flower_cmsg.h"
 #include "flower/nfp_flower_representor.h"
 #include "nfpcore/nfp_rtsym.h"
 #include "nfp_logs.h"
diff --git a/drivers/net/nfp/nfp_rxtx.c b/drivers/net/nfp/nfp_rxtx.c
index eeca193d14..e74aba7439 100644
--- a/drivers/net/nfp/nfp_rxtx.c
+++ b/drivers/net/nfp/nfp_rxtx.c
@@ -9,7 +9,6 @@ 
 
 #include <ethdev_pci.h>
 
-#include "nfp_common.h"
 #include "nfd3/nfp_nfd3.h"
 #include "nfdk/nfp_nfdk.h"
 #include "flower/nfp_flower.h"