event/cnxk: remove single dequeue functions

diff --git a/drivers/event/cnxk/cn10k_eventdev.c b/drivers/event/cnxk/cn10k_eventdev.c
index a099356562..8c8fb579cc 100644
--- a/drivers/event/cnxk/cn10k_eventdev.c
+++ b/drivers/event/cnxk/cn10k_eventdev.c
@@ -422,12 +422,9 @@  cn10k_sso_fp_blk_fns_set(struct rte_eventdev *event_dev)
 #if defined(CNXK_DIS_TMPLT_FUNC)
 	struct cnxk_sso_evdev *dev = cnxk_sso_pmd_priv(event_dev);

-	event_dev->dequeue = cn10k_sso_hws_deq_all_offload;
 	event_dev->dequeue_burst = cn10k_sso_hws_deq_burst_all_offload;
-	if (dev->rx_offloads & NIX_RX_OFFLOAD_TSTAMP_F) {
-		event_dev->dequeue = cn10k_sso_hws_deq_all_offload_tst;
+	if (dev->rx_offloads & NIX_RX_OFFLOAD_TSTAMP_F)
 		event_dev->dequeue_burst = cn10k_sso_hws_deq_burst_all_offload_tst;
-	}
 	event_dev->txa_enqueue = cn10k_sso_hws_tx_adptr_enq_seg_all_offload;
 	event_dev->txa_enqueue_same_dest = cn10k_sso_hws_tx_adptr_enq_seg_all_offload;
 	if (dev->tx_offloads & (NIX_TX_OFFLOAD_OL3_OL4_CSUM_F | NIX_TX_OFFLOAD_VLAN_QINQ_F |
diff --git a/drivers/event/cnxk/cn10k_worker.h b/drivers/event/cnxk/cn10k_worker.h
index f0bfa12640..5d3394508e 100644
--- a/drivers/event/cnxk/cn10k_worker.h
+++ b/drivers/event/cnxk/cn10k_worker.h
@@ -380,83 +380,51 @@  int __rte_hot cn10k_sso_hws_preschedule_modify(void *port,
 					       enum rte_event_dev_preschedule_type type);

 #define R(name, flags)                                                         \
-	uint16_t __rte_hot cn10k_sso_hws_deq_##name(                           \
-		void *port, struct rte_event *ev, uint64_t timeout_ticks);     \
 	uint16_t __rte_hot cn10k_sso_hws_deq_burst_##name(                     \
 		void *port, struct rte_event ev[], uint16_t nb_events,         \
 		uint64_t timeout_ticks);                                       \
-	uint16_t __rte_hot cn10k_sso_hws_deq_tmo_##name(                       \
-		void *port, struct rte_event *ev, uint64_t timeout_ticks);     \
 	uint16_t __rte_hot cn10k_sso_hws_deq_tmo_burst_##name(                 \
 		void *port, struct rte_event ev[], uint16_t nb_events,         \
 		uint64_t timeout_ticks);                                       \
-	uint16_t __rte_hot cn10k_sso_hws_deq_ca_##name(                        \
-		void *port, struct rte_event *ev, uint64_t timeout_ticks);     \
 	uint16_t __rte_hot cn10k_sso_hws_deq_ca_burst_##name(                  \
 		void *port, struct rte_event ev[], uint16_t nb_events,         \
 		uint64_t timeout_ticks);                                       \
-	uint16_t __rte_hot cn10k_sso_hws_deq_tmo_ca_##name(                    \
-		void *port, struct rte_event *ev, uint64_t timeout_ticks);     \
 	uint16_t __rte_hot cn10k_sso_hws_deq_tmo_ca_burst_##name(              \
 		void *port, struct rte_event ev[], uint16_t nb_events,         \
 		uint64_t timeout_ticks);                                       \
-	uint16_t __rte_hot cn10k_sso_hws_deq_seg_##name(                       \
-		void *port, struct rte_event *ev, uint64_t timeout_ticks);     \
 	uint16_t __rte_hot cn10k_sso_hws_deq_seg_burst_##name(                 \
 		void *port, struct rte_event ev[], uint16_t nb_events,         \
 		uint64_t timeout_ticks);                                       \
-	uint16_t __rte_hot cn10k_sso_hws_deq_tmo_seg_##name(                   \
-		void *port, struct rte_event *ev, uint64_t timeout_ticks);     \
 	uint16_t __rte_hot cn10k_sso_hws_deq_tmo_seg_burst_##name(             \
 		void *port, struct rte_event ev[], uint16_t nb_events,         \
 		uint64_t timeout_ticks);                                       \
-	uint16_t __rte_hot cn10k_sso_hws_deq_ca_seg_##name(                    \
-		void *port, struct rte_event *ev, uint64_t timeout_ticks);     \
 	uint16_t __rte_hot cn10k_sso_hws_deq_ca_seg_burst_##name(              \
 		void *port, struct rte_event ev[], uint16_t nb_events,         \
 		uint64_t timeout_ticks);                                       \
-	uint16_t __rte_hot cn10k_sso_hws_deq_tmo_ca_seg_##name(                \
-		void *port, struct rte_event *ev, uint64_t timeout_ticks);     \
 	uint16_t __rte_hot cn10k_sso_hws_deq_tmo_ca_seg_burst_##name(          \
 		void *port, struct rte_event ev[], uint16_t nb_events,         \
 		uint64_t timeout_ticks);                                       \
-	uint16_t __rte_hot cn10k_sso_hws_reas_deq_##name(                      \
-		void *port, struct rte_event *ev, uint64_t timeout_ticks);     \
 	uint16_t __rte_hot cn10k_sso_hws_reas_deq_burst_##name(                \
 		void *port, struct rte_event ev[], uint16_t nb_events,         \
 		uint64_t timeout_ticks);                                       \
-	uint16_t __rte_hot cn10k_sso_hws_reas_deq_tmo_##name(                  \
-		void *port, struct rte_event *ev, uint64_t timeout_ticks);     \
 	uint16_t __rte_hot cn10k_sso_hws_reas_deq_tmo_burst_##name(            \
 		void *port, struct rte_event ev[], uint16_t nb_events,         \
 		uint64_t timeout_ticks);                                       \
-	uint16_t __rte_hot cn10k_sso_hws_reas_deq_ca_##name(                   \
-		void *port, struct rte_event *ev, uint64_t timeout_ticks);     \
 	uint16_t __rte_hot cn10k_sso_hws_reas_deq_ca_burst_##name(             \
 		void *port, struct rte_event ev[], uint16_t nb_events,         \
 		uint64_t timeout_ticks);                                       \
-	uint16_t __rte_hot cn10k_sso_hws_reas_deq_tmo_ca_##name(               \
-		void *port, struct rte_event *ev, uint64_t timeout_ticks);     \
 	uint16_t __rte_hot cn10k_sso_hws_reas_deq_tmo_ca_burst_##name(         \
 		void *port, struct rte_event ev[], uint16_t nb_events,         \
 		uint64_t timeout_ticks);                                       \
-	uint16_t __rte_hot cn10k_sso_hws_reas_deq_seg_##name(                  \
-		void *port, struct rte_event *ev, uint64_t timeout_ticks);     \
 	uint16_t __rte_hot cn10k_sso_hws_reas_deq_seg_burst_##name(            \
 		void *port, struct rte_event ev[], uint16_t nb_events,         \
 		uint64_t timeout_ticks);                                       \
-	uint16_t __rte_hot cn10k_sso_hws_reas_deq_tmo_seg_##name(              \
-		void *port, struct rte_event *ev, uint64_t timeout_ticks);     \
 	uint16_t __rte_hot cn10k_sso_hws_reas_deq_tmo_seg_burst_##name(        \
 		void *port, struct rte_event ev[], uint16_t nb_events,         \
 		uint64_t timeout_ticks);                                       \
-	uint16_t __rte_hot cn10k_sso_hws_reas_deq_ca_seg_##name(               \
-		void *port, struct rte_event *ev, uint64_t timeout_ticks);     \
 	uint16_t __rte_hot cn10k_sso_hws_reas_deq_ca_seg_burst_##name(         \
 		void *port, struct rte_event ev[], uint16_t nb_events,         \
 		uint64_t timeout_ticks);                                       \
-	uint16_t __rte_hot cn10k_sso_hws_reas_deq_tmo_ca_seg_##name(           \
-		void *port, struct rte_event *ev, uint64_t timeout_ticks);     \
 	uint16_t __rte_hot cn10k_sso_hws_reas_deq_tmo_ca_seg_burst_##name(     \
 		void *port, struct rte_event ev[], uint16_t nb_events,         \
 		uint64_t timeout_ticks);
@@ -464,44 +432,55 @@  int __rte_hot cn10k_sso_hws_preschedule_modify(void *port,
 NIX_RX_FASTPATH_MODES
 #undef R

-#define SSO_DEQ(fn, flags)                                                     \
-	uint16_t __rte_hot fn(void *port, struct rte_event *ev,                \
-			      uint64_t timeout_ticks)                          \
-	{                                                                      \
-		struct cn10k_sso_hws *ws = port;                               \
-		RTE_SET_USED(timeout_ticks);                                   \
-		if (ws->swtag_req) {                                           \
-			ws->swtag_req = 0;                                     \
-			ws->gw_rdata = cnxk_sso_hws_swtag_wait(                \
-				ws->base + SSOW_LF_GWS_WQE0);                  \
-			return 1;                                              \
-		}                                                              \
-		return cn10k_sso_hws_get_work(ws, ev, flags);                  \
+#define SSO_DEQ(fn, flags)                                                                         \
+	static __rte_always_inline uint16_t fn(void *port, struct rte_event *ev,                   \
+					       uint64_t timeout_ticks)                             \
+	{                                                                                          \
+		struct cn10k_sso_hws *ws = port;                                                   \
+		RTE_SET_USED(timeout_ticks);                                                       \
+		if (ws->swtag_req) {                                                               \
+			ws->swtag_req = 0;                                                         \
+			ws->gw_rdata = cnxk_sso_hws_swtag_wait(ws->base + SSOW_LF_GWS_WQE0);       \
+			return 1;                                                                  \
+		}                                                                                  \
+		return cn10k_sso_hws_get_work(ws, ev, flags);                                      \
 	}

 #define SSO_DEQ_SEG(fn, flags)	  SSO_DEQ(fn, flags | NIX_RX_MULTI_SEG_F)

-#define SSO_DEQ_TMO(fn, flags)                                                 \
-	uint16_t __rte_hot fn(void *port, struct rte_event *ev,                \
-			      uint64_t timeout_ticks)                          \
-	{                                                                      \
-		struct cn10k_sso_hws *ws = port;                               \
-		uint16_t ret = 1;                                              \
-		uint64_t iter;                                                 \
-		if (ws->swtag_req) {                                           \
-			ws->swtag_req = 0;                                     \
-			ws->gw_rdata = cnxk_sso_hws_swtag_wait(                \
-				ws->base + SSOW_LF_GWS_WQE0);                  \
-			return ret;                                            \
-		}                                                              \
-		ret = cn10k_sso_hws_get_work(ws, ev, flags);                   \
-		for (iter = 1; iter < timeout_ticks && (ret == 0); iter++)     \
-			ret = cn10k_sso_hws_get_work(ws, ev, flags);           \
-		return ret;                                                    \
+#define SSO_DEQ_TMO(fn, flags)                                                                     \
+	static __rte_always_inline uint16_t fn(void *port, struct rte_event *ev,                   \
+					       uint64_t timeout_ticks)                             \
+	{                                                                                          \
+		struct cn10k_sso_hws *ws = port;                                                   \
+		uint16_t ret = 1;                                                                  \
+		uint64_t iter;                                                                     \
+		if (ws->swtag_req) {                                                               \
+			ws->swtag_req = 0;                                                         \
+			ws->gw_rdata = cnxk_sso_hws_swtag_wait(ws->base + SSOW_LF_GWS_WQE0);       \
+			return ret;                                                                \
+		}                                                                                  \
+		ret = cn10k_sso_hws_get_work(ws, ev, flags);                                       \
+		for (iter = 1; iter < timeout_ticks && (ret == 0); iter++)                         \
+			ret = cn10k_sso_hws_get_work(ws, ev, flags);                               \
+		return ret;                                                                        \
 	}

 #define SSO_DEQ_TMO_SEG(fn, flags)    SSO_DEQ_TMO(fn, flags | NIX_RX_MULTI_SEG_F)

+#define R(name, flags)                                                                             \
+	SSO_DEQ(cn10k_sso_hws_deq_##name, flags)                                                   \
+	SSO_DEQ(cn10k_sso_hws_reas_deq_##name, flags | NIX_RX_REAS_F)                              \
+	SSO_DEQ_SEG(cn10k_sso_hws_deq_seg_##name, flags)                                           \
+	SSO_DEQ_SEG(cn10k_sso_hws_reas_deq_seg_##name, flags | NIX_RX_REAS_F)                      \
+	SSO_DEQ_TMO(cn10k_sso_hws_deq_tmo_##name, flags)                                           \
+	SSO_DEQ_TMO(cn10k_sso_hws_reas_deq_tmo_##name, flags | NIX_RX_REAS_F)                      \
+	SSO_DEQ_TMO_SEG(cn10k_sso_hws_deq_tmo_seg_##name, flags)                                   \
+	SSO_DEQ_TMO_SEG(cn10k_sso_hws_reas_deq_tmo_seg_##name, flags | NIX_RX_REAS_F)
+
+NIX_RX_FASTPATH_MODES
+#undef R
+
 #define SSO_CMN_DEQ_BURST(fnb, fn, flags)                                      \
 	uint16_t __rte_hot fnb(void *port, struct rte_event ev[],              \
 			       uint16_t nb_events, uint64_t timeout_ticks)     \
@@ -518,12 +497,8 @@  NIX_RX_FASTPATH_MODES
 		return fn(port, ev, timeout_ticks);                            \
 	}

-uint16_t __rte_hot cn10k_sso_hws_deq_all_offload(void *port, struct rte_event *ev,
-						 uint64_t timeout_ticks);
 uint16_t __rte_hot cn10k_sso_hws_deq_burst_all_offload(void *port, struct rte_event ev[],
 						       uint16_t nb_events, uint64_t timeout_ticks);
-uint16_t __rte_hot cn10k_sso_hws_deq_all_offload_tst(void *port, struct rte_event *ev,
-						     uint64_t timeout_ticks);
 uint16_t __rte_hot cn10k_sso_hws_deq_burst_all_offload_tst(void *port, struct rte_event ev[],
 							   uint16_t nb_events,
 							   uint64_t timeout_ticks);
diff --git a/drivers/event/cnxk/cn9k_eventdev.c b/drivers/event/cnxk/cn9k_eventdev.c
index 431e1670d5..b176044aa5 100644
--- a/drivers/event/cnxk/cn9k_eventdev.c
+++ b/drivers/event/cnxk/cn9k_eventdev.c
@@ -465,12 +465,9 @@  cn9k_sso_fp_blk_fns_set(struct rte_eventdev *event_dev)
 #if defined(CNXK_DIS_TMPLT_FUNC)
 	struct cnxk_sso_evdev *dev = cnxk_sso_pmd_priv(event_dev);

-	event_dev->dequeue = cn9k_sso_hws_deq_all_offload;
 	event_dev->dequeue_burst = cn9k_sso_hws_deq_burst_all_offload;
-	if (dev->rx_offloads & NIX_RX_OFFLOAD_TSTAMP_F) {
-		event_dev->dequeue = cn9k_sso_hws_deq_all_offload_tst;
+	if (dev->rx_offloads & NIX_RX_OFFLOAD_TSTAMP_F)
 		event_dev->dequeue_burst = cn9k_sso_hws_deq_burst_all_offload_tst;
-	}
 	event_dev->txa_enqueue = cn9k_sso_hws_tx_adptr_enq_seg_all_offload;
 	event_dev->txa_enqueue_same_dest = cn9k_sso_hws_tx_adptr_enq_seg_all_offload;
 	if (dev->tx_offloads & NIX_TX_OFFLOAD_TSTAMP_F) {
@@ -478,12 +475,9 @@  cn9k_sso_fp_blk_fns_set(struct rte_eventdev *event_dev)
 		event_dev->txa_enqueue_same_dest = cn9k_sso_hws_tx_adptr_enq_seg_all_offload_tst;
 	}
 	if (dev->dual_ws) {
-		event_dev->dequeue = cn9k_sso_hws_deq_dual_all_offload;
 		event_dev->dequeue_burst = cn9k_sso_hws_deq_dual_burst_all_offload;
-		if (dev->rx_offloads & NIX_RX_OFFLOAD_TSTAMP_F) {
-			event_dev->dequeue = cn9k_sso_hws_deq_dual_all_offload_tst;
+		if (dev->rx_offloads & NIX_RX_OFFLOAD_TSTAMP_F)
 			event_dev->dequeue_burst = cn9k_sso_hws_deq_dual_burst_all_offload_tst;
-		}
 		event_dev->txa_enqueue = cn9k_sso_hws_tx_adptr_enq_dual_seg_all_offload;
 		event_dev->txa_enqueue_same_dest = cn9k_sso_hws_tx_adptr_enq_dual_seg_all_offload;
 		if (dev->tx_offloads & NIX_TX_OFFLOAD_TSTAMP_F) {
diff --git a/drivers/event/cnxk/cn9k_worker.h b/drivers/event/cnxk/cn9k_worker.h
index 635c2f6e9a..064cdfe94a 100644
--- a/drivers/event/cnxk/cn9k_worker.h
+++ b/drivers/event/cnxk/cn9k_worker.h
@@ -386,23 +386,15 @@  uint16_t __rte_hot cn9k_sso_hws_dual_ca_enq(void *port, struct rte_event ev[],
 int __rte_hot cn9k_sso_hws_dual_profile_switch(void *port, uint8_t profile);

 #define R(name, flags)                                                         \
-	uint16_t __rte_hot cn9k_sso_hws_deq_##name(                            \
-		void *port, struct rte_event *ev, uint64_t timeout_ticks);     \
 	uint16_t __rte_hot cn9k_sso_hws_deq_burst_##name(                      \
 		void *port, struct rte_event ev[], uint16_t nb_events,         \
 		uint64_t timeout_ticks);                                       \
-	uint16_t __rte_hot cn9k_sso_hws_deq_tmo_##name(                        \
-		void *port, struct rte_event *ev, uint64_t timeout_ticks);     \
 	uint16_t __rte_hot cn9k_sso_hws_deq_tmo_burst_##name(                  \
 		void *port, struct rte_event ev[], uint16_t nb_events,         \
 		uint64_t timeout_ticks);                                       \
-	uint16_t __rte_hot cn9k_sso_hws_deq_seg_##name(                        \
-		void *port, struct rte_event *ev, uint64_t timeout_ticks);     \
 	uint16_t __rte_hot cn9k_sso_hws_deq_seg_burst_##name(                  \
 		void *port, struct rte_event ev[], uint16_t nb_events,         \
 		uint64_t timeout_ticks);                                       \
-	uint16_t __rte_hot cn9k_sso_hws_deq_tmo_seg_##name(                    \
-		void *port, struct rte_event *ev, uint64_t timeout_ticks);     \
 	uint16_t __rte_hot cn9k_sso_hws_deq_tmo_seg_burst_##name(              \
 		void *port, struct rte_event ev[], uint16_t nb_events,         \
 		uint64_t timeout_ticks);
@@ -410,119 +402,114 @@  int __rte_hot cn9k_sso_hws_dual_profile_switch(void *port, uint8_t profile);
 NIX_RX_FASTPATH_MODES
 #undef R

-#define SSO_DEQ(fn, flags)                                                     \
-	uint16_t __rte_hot fn(void *port, struct rte_event *ev,                \
-			      uint64_t timeout_ticks)                          \
-	{                                                                      \
-		struct cn9k_sso_hws *ws = port;                                \
-		RTE_SET_USED(timeout_ticks);                                   \
-		if (ws->swtag_req) {                                           \
-			ws->swtag_req = 0;                                     \
-			cnxk_sso_hws_swtag_wait(ws->base + SSOW_LF_GWS_TAG);   \
-			return 1;                                              \
-		}                                                              \
-		return cn9k_sso_hws_get_work(ws, ev, flags, ws->lookup_mem);   \
+#define SSO_DEQ(fn, flags)                                                                         \
+	static __rte_always_inline uint16_t fn(void *port, struct rte_event *ev,                   \
+					       uint64_t timeout_ticks)                             \
+	{                                                                                          \
+		struct cn9k_sso_hws *ws = port;                                                    \
+		RTE_SET_USED(timeout_ticks);                                                       \
+		if (ws->swtag_req) {                                                               \
+			ws->swtag_req = 0;                                                         \
+			cnxk_sso_hws_swtag_wait(ws->base + SSOW_LF_GWS_TAG);                       \
+			return 1;                                                                  \
+		}                                                                                  \
+		return cn9k_sso_hws_get_work(ws, ev, flags, ws->lookup_mem);                       \
 	}

 #define SSO_DEQ_SEG(fn, flags)	  SSO_DEQ(fn, flags | NIX_RX_MULTI_SEG_F)

-#define SSO_DEQ_TMO(fn, flags)                                                 \
-	uint16_t __rte_hot fn(void *port, struct rte_event *ev,                \
-			      uint64_t timeout_ticks)                          \
-	{                                                                      \
-		struct cn9k_sso_hws *ws = port;                                \
-		uint16_t ret = 1;                                              \
-		uint64_t iter;                                                 \
-		if (ws->swtag_req) {                                           \
-			ws->swtag_req = 0;                                     \
-			cnxk_sso_hws_swtag_wait(ws->base + SSOW_LF_GWS_TAG);   \
-			return ret;                                            \
-		}                                                              \
-		ret = cn9k_sso_hws_get_work(ws, ev, flags, ws->lookup_mem);    \
-		for (iter = 1; iter < timeout_ticks && (ret == 0); iter++)     \
-			ret = cn9k_sso_hws_get_work(ws, ev, flags,             \
-						    ws->lookup_mem);           \
-		return ret;                                                    \
+#define SSO_DEQ_TMO(fn, flags)                                                                     \
+	static __rte_always_inline uint16_t fn(void *port, struct rte_event *ev,                   \
+					       uint64_t timeout_ticks)                             \
+	{                                                                                          \
+		struct cn9k_sso_hws *ws = port;                                                    \
+		uint16_t ret = 1;                                                                  \
+		uint64_t iter;                                                                     \
+		if (ws->swtag_req) {                                                               \
+			ws->swtag_req = 0;                                                         \
+			cnxk_sso_hws_swtag_wait(ws->base + SSOW_LF_GWS_TAG);                       \
+			return ret;                                                                \
+		}                                                                                  \
+		ret = cn9k_sso_hws_get_work(ws, ev, flags, ws->lookup_mem);                        \
+		for (iter = 1; iter < timeout_ticks && (ret == 0); iter++)                         \
+			ret = cn9k_sso_hws_get_work(ws, ev, flags, ws->lookup_mem);                \
+		return ret;                                                                        \
 	}

 #define SSO_DEQ_TMO_SEG(fn, flags)    SSO_DEQ_TMO(fn, flags | NIX_RX_MULTI_SEG_F)

-#define R(name, flags)                                                         \
-	uint16_t __rte_hot cn9k_sso_hws_dual_deq_##name(                       \
-		void *port, struct rte_event *ev, uint64_t timeout_ticks);     \
-	uint16_t __rte_hot cn9k_sso_hws_dual_deq_burst_##name(                 \
-		void *port, struct rte_event ev[], uint16_t nb_events,         \
-		uint64_t timeout_ticks);                                       \
-	uint16_t __rte_hot cn9k_sso_hws_dual_deq_tmo_##name(                   \
-		void *port, struct rte_event *ev, uint64_t timeout_ticks);     \
-	uint16_t __rte_hot cn9k_sso_hws_dual_deq_tmo_burst_##name(             \
-		void *port, struct rte_event ev[], uint16_t nb_events,         \
-		uint64_t timeout_ticks);                                       \
-	uint16_t __rte_hot cn9k_sso_hws_dual_deq_seg_##name(                   \
-		void *port, struct rte_event *ev, uint64_t timeout_ticks);     \
-	uint16_t __rte_hot cn9k_sso_hws_dual_deq_seg_burst_##name(             \
-		void *port, struct rte_event ev[], uint16_t nb_events,         \
-		uint64_t timeout_ticks);                                       \
-	uint16_t __rte_hot cn9k_sso_hws_dual_deq_tmo_seg_##name(               \
-		void *port, struct rte_event *ev, uint64_t timeout_ticks);     \
-	uint16_t __rte_hot cn9k_sso_hws_dual_deq_tmo_seg_burst_##name(         \
-		void *port, struct rte_event ev[], uint16_t nb_events,         \
-		uint64_t timeout_ticks);
+#define R(name, flags)                                                                             \
+	uint16_t __rte_hot cn9k_sso_hws_dual_deq_burst_##name(                                     \
+		void *port, struct rte_event ev[], uint16_t nb_events, uint64_t timeout_ticks);    \
+	uint16_t __rte_hot cn9k_sso_hws_dual_deq_tmo_burst_##name(                                 \
+		void *port, struct rte_event ev[], uint16_t nb_events, uint64_t timeout_ticks);    \
+	uint16_t __rte_hot cn9k_sso_hws_dual_deq_seg_burst_##name(                                 \
+		void *port, struct rte_event ev[], uint16_t nb_events, uint64_t timeout_ticks);    \
+	uint16_t __rte_hot cn9k_sso_hws_dual_deq_tmo_seg_burst_##name(                             \
+		void *port, struct rte_event ev[], uint16_t nb_events, uint64_t timeout_ticks);

 NIX_RX_FASTPATH_MODES
 #undef R

-#define SSO_DUAL_DEQ(fn, flags)                                                \
-	uint16_t __rte_hot fn(void *port, struct rte_event *ev,                \
-			      uint64_t timeout_ticks)                          \
-	{                                                                      \
-		struct cn9k_sso_hws_dual *dws = port;                          \
-		uint16_t gw;                                                   \
-		RTE_SET_USED(timeout_ticks);                                   \
-		if (dws->swtag_req) {                                          \
-			dws->swtag_req = 0;                                    \
-			cnxk_sso_hws_swtag_wait(dws->base[!dws->vws] +         \
-						SSOW_LF_GWS_TAG);              \
-			return 1;                                              \
-		}                                                              \
-		gw = cn9k_sso_hws_dual_get_work(dws->base[dws->vws],           \
-						dws->base[!dws->vws], ev,      \
-						flags, dws);                   \
-		dws->vws = !dws->vws;                                          \
-		return gw;                                                     \
+#define SSO_DUAL_DEQ(fn, flags)                                                                    \
+	static __rte_always_inline uint16_t fn(void *port, struct rte_event *ev,                   \
+					       uint64_t timeout_ticks)                             \
+	{                                                                                          \
+		struct cn9k_sso_hws_dual *dws = port;                                              \
+		uint16_t gw;                                                                       \
+		RTE_SET_USED(timeout_ticks);                                                       \
+		if (dws->swtag_req) {                                                              \
+			dws->swtag_req = 0;                                                        \
+			cnxk_sso_hws_swtag_wait(dws->base[!dws->vws] + SSOW_LF_GWS_TAG);           \
+			return 1;                                                                  \
+		}                                                                                  \
+		gw = cn9k_sso_hws_dual_get_work(dws->base[dws->vws], dws->base[!dws->vws], ev,     \
+						flags, dws);                                       \
+		dws->vws = !dws->vws;                                                              \
+		return gw;                                                                         \
 	}

 #define SSO_DUAL_DEQ_SEG(fn, flags) SSO_DUAL_DEQ(fn, flags | NIX_RX_MULTI_SEG_F)

-#define SSO_DUAL_DEQ_TMO(fn, flags)                                            \
-	uint16_t __rte_hot fn(void *port, struct rte_event *ev,                \
-			      uint64_t timeout_ticks)                          \
-	{                                                                      \
-		struct cn9k_sso_hws_dual *dws = port;                          \
-		uint16_t ret = 1;                                              \
-		uint64_t iter;                                                 \
-		if (dws->swtag_req) {                                          \
-			dws->swtag_req = 0;                                    \
-			cnxk_sso_hws_swtag_wait(dws->base[!dws->vws] +         \
-						SSOW_LF_GWS_TAG);              \
-			return ret;                                            \
-		}                                                              \
-		ret = cn9k_sso_hws_dual_get_work(dws->base[dws->vws],          \
-						 dws->base[!dws->vws], ev,     \
-						 flags, dws);                  \
-		dws->vws = !dws->vws;                                          \
-		for (iter = 1; iter < timeout_ticks && (ret == 0); iter++) {   \
-			ret = cn9k_sso_hws_dual_get_work(dws->base[dws->vws],  \
-							 dws->base[!dws->vws], \
-							 ev, flags, dws);      \
-			dws->vws = !dws->vws;                                  \
-		}                                                              \
-		return ret;                                                    \
+#define SSO_DUAL_DEQ_TMO(fn, flags)                                                                \
+	static __rte_always_inline uint16_t fn(void *port, struct rte_event *ev,                   \
+					       uint64_t timeout_ticks)                             \
+	{                                                                                          \
+		struct cn9k_sso_hws_dual *dws = port;                                              \
+		uint16_t ret = 1;                                                                  \
+		uint64_t iter;                                                                     \
+		if (dws->swtag_req) {                                                              \
+			dws->swtag_req = 0;                                                        \
+			cnxk_sso_hws_swtag_wait(dws->base[!dws->vws] + SSOW_LF_GWS_TAG);           \
+			return ret;                                                                \
+		}                                                                                  \
+		ret = cn9k_sso_hws_dual_get_work(dws->base[dws->vws], dws->base[!dws->vws], ev,    \
+						 flags, dws);                                      \
+		dws->vws = !dws->vws;                                                              \
+		for (iter = 1; iter < timeout_ticks && (ret == 0); iter++) {                       \
+			ret = cn9k_sso_hws_dual_get_work(dws->base[dws->vws],                      \
+							 dws->base[!dws->vws], ev, flags, dws);    \
+			dws->vws = !dws->vws;                                                      \
+		}                                                                                  \
+		return ret;                                                                        \
 	}

 #define SSO_DUAL_DEQ_TMO_SEG(fn, flags)                                        \
 	SSO_DUAL_DEQ_TMO(fn, flags | NIX_RX_MULTI_SEG_F)

+#define R(name, flags)                                                                             \
+	SSO_DEQ(cn9k_sso_hws_deq_##name, flags)                                                    \
+	SSO_DEQ(cn9k_sso_hws_dual_deq_##name, flags)                                               \
+	SSO_DEQ_SEG(cn9k_sso_hws_deq_seg_##name, flags)                                            \
+	SSO_DEQ_SEG(cn9k_sso_hws_dual_deq_seg_##name, flags)                                       \
+	SSO_DEQ_TMO(cn9k_sso_hws_deq_tmo_##name, flags)                                            \
+	SSO_DEQ_TMO(cn9k_sso_hws_dual_deq_tmo_##name, flags)                                       \
+	SSO_DEQ_TMO_SEG(cn9k_sso_hws_deq_tmo_seg_##name, flags)                                    \
+	SSO_DEQ_TMO_SEG(cn9k_sso_hws_dual_deq_tmo_seg_##name, flags)
+
+NIX_RX_FASTPATH_MODES
+#undef R
+
 #define SSO_CMN_DEQ_BURST(fnb, fn, flags)                                      \
 	uint16_t __rte_hot fnb(void *port, struct rte_event ev[],              \
 			       uint16_t nb_events, uint64_t timeout_ticks)     \
@@ -539,12 +526,6 @@  NIX_RX_FASTPATH_MODES
 		return fn(port, ev, timeout_ticks);                            \
 	}

-uint16_t __rte_hot cn9k_sso_hws_deq_all_offload(void *port, struct rte_event *ev,
-						uint64_t timeout_ticks);
-
-uint16_t __rte_hot cn9k_sso_hws_deq_dual_all_offload(void *port, struct rte_event *ev,
-						     uint64_t timeout_ticks);
-
 uint16_t __rte_hot cn9k_sso_hws_deq_burst_all_offload(void *port, struct rte_event ev[],
 						      uint16_t nb_events, uint64_t timeout_ticks);

@@ -552,12 +533,6 @@  uint16_t __rte_hot cn9k_sso_hws_deq_dual_burst_all_offload(void *port, struct rt
 							   uint16_t nb_events,
 							   uint64_t timeout_ticks);

-uint16_t __rte_hot cn9k_sso_hws_deq_all_offload_tst(void *port, struct rte_event *ev,
-						    uint64_t timeout_ticks);
-
-uint16_t __rte_hot cn9k_sso_hws_deq_dual_all_offload_tst(void *port, struct rte_event *ev,
-							 uint64_t timeout_ticks);
-
 uint16_t __rte_hot cn9k_sso_hws_deq_burst_all_offload_tst(void *port, struct rte_event ev[],
 							  uint16_t nb_events,
 							  uint64_t timeout_ticks);
diff --git a/drivers/event/cnxk/deq/cn10k/deq_0_15.c b/drivers/event/cnxk/deq/cn10k/deq_0_15.c
deleted file mode 100644
index e1ea267394..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_0_15.c
+++ /dev/null
@@ -1,20 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags)                                                         \
-	SSO_DEQ(cn10k_sso_hws_deq_##name, flags)                                \
-	SSO_DEQ(cn10k_sso_hws_reas_deq_##name, flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_0_15
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn10k/deq_0_15_seg.c b/drivers/event/cnxk/deq/cn10k/deq_0_15_seg.c
deleted file mode 100644
index 9e48bd2170..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_0_15_seg.c
+++ /dev/null
@@ -1,20 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags)                                                         \
-	SSO_DEQ_SEG(cn10k_sso_hws_deq_seg_##name, flags)                       \
-	SSO_DEQ_SEG(cn10k_sso_hws_reas_deq_seg_##name, flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_0_15
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn10k/deq_0_15_tmo.c b/drivers/event/cnxk/deq/cn10k/deq_0_15_tmo.c
deleted file mode 100644
index 4110b24312..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_0_15_tmo.c
+++ /dev/null
@@ -1,20 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags)                                                         \
-	SSO_DEQ_TMO(cn10k_sso_hws_deq_tmo_##name, flags)                       \
-	SSO_DEQ_TMO(cn10k_sso_hws_reas_deq_tmo_##name, flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_0_15
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn10k/deq_0_15_tmo_seg.c b/drivers/event/cnxk/deq/cn10k/deq_0_15_tmo_seg.c
deleted file mode 100644
index 27fba138de..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_0_15_tmo_seg.c
+++ /dev/null
@@ -1,20 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags)                                                         \
-	SSO_DEQ_TMO_SEG(cn10k_sso_hws_deq_tmo_seg_##name, flags)               \
-	SSO_DEQ_TMO_SEG(cn10k_sso_hws_reas_deq_tmo_seg_##name, flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_0_15
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn10k/deq_112_127.c b/drivers/event/cnxk/deq/cn10k/deq_112_127.c
deleted file mode 100644
index d7c0c21770..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_112_127.c
+++ /dev/null
@@ -1,20 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags)                                                         \
-	SSO_DEQ(cn10k_sso_hws_deq_##name, flags)                               \
-	SSO_DEQ(cn10k_sso_hws_reas_deq_##name, flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_112_127
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn10k/deq_112_127_seg.c b/drivers/event/cnxk/deq/cn10k/deq_112_127_seg.c
deleted file mode 100644
index 47c1ecdf2f..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_112_127_seg.c
+++ /dev/null
@@ -1,20 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags)                                                         \
-	SSO_DEQ_SEG(cn10k_sso_hws_deq_seg_##name, flags)                       \
-	SSO_DEQ_SEG(cn10k_sso_hws_reas_deq_seg_##name, flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_112_127
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn10k/deq_112_127_tmo.c b/drivers/event/cnxk/deq/cn10k/deq_112_127_tmo.c
deleted file mode 100644
index 9b4f028678..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_112_127_tmo.c
+++ /dev/null
@@ -1,20 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags)                                                         \
-	SSO_DEQ_TMO(cn10k_sso_hws_deq_tmo_##name, flags)                       \
-	SSO_DEQ_TMO(cn10k_sso_hws_reas_deq_tmo_##name, flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_112_127
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn10k/deq_112_127_tmo_seg.c b/drivers/event/cnxk/deq/cn10k/deq_112_127_tmo_seg.c
deleted file mode 100644
index 7bbe2086ee..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_112_127_tmo_seg.c
+++ /dev/null
@@ -1,17 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-
-#define R(name, flags)                                                         \
-	SSO_DEQ_TMO_SEG(cn10k_sso_hws_deq_tmo_seg_##name, flags)               \
-	SSO_DEQ_TMO_SEG(cn10k_sso_hws_reas_deq_tmo_seg_##name, flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_112_127
-#undef R
diff --git a/drivers/event/cnxk/deq/cn10k/deq_16_31.c b/drivers/event/cnxk/deq/cn10k/deq_16_31.c
deleted file mode 100644
index e5776a8b64..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_16_31.c
+++ /dev/null
@@ -1,20 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags)                                                         \
-	SSO_DEQ(cn10k_sso_hws_deq_##name, flags)                               \
-	SSO_DEQ(cn10k_sso_hws_reas_deq_##name, flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_16_31
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn10k/deq_16_31_seg.c b/drivers/event/cnxk/deq/cn10k/deq_16_31_seg.c
deleted file mode 100644
index 83e1ace903..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_16_31_seg.c
+++ /dev/null
@@ -1,20 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags)                                                         \
-	SSO_DEQ_SEG(cn10k_sso_hws_deq_seg_##name, flags)                       \
-	SSO_DEQ_SEG(cn10k_sso_hws_reas_deq_seg_##name, flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_16_31
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn10k/deq_16_31_tmo.c b/drivers/event/cnxk/deq/cn10k/deq_16_31_tmo.c
deleted file mode 100644
index e17e71db2b..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_16_31_tmo.c
+++ /dev/null
@@ -1,20 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags)                                                         \
-	SSO_DEQ_TMO(cn10k_sso_hws_deq_tmo_##name, flags)                       \
-	SSO_DEQ_TMO(cn10k_sso_hws_reas_deq_tmo_##name, flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_16_31
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn10k/deq_16_31_tmo_seg.c b/drivers/event/cnxk/deq/cn10k/deq_16_31_tmo_seg.c
deleted file mode 100644
index bf00a04f34..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_16_31_tmo_seg.c
+++ /dev/null
@@ -1,21 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags)                                                         \
-	SSO_DEQ_TMO_SEG(cn10k_sso_hws_deq_tmo_seg_##name, flags)               \
-	SSO_DEQ_TMO_SEG(cn10k_sso_hws_reas_deq_tmo_seg_##name,                 \
-			flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_16_31
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn10k/deq_32_47.c b/drivers/event/cnxk/deq/cn10k/deq_32_47.c
deleted file mode 100644
index 9fc32fc8f1..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_32_47.c
+++ /dev/null
@@ -1,20 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags)                                                         \
-	SSO_DEQ(cn10k_sso_hws_deq_##name, flags)                               \
-	SSO_DEQ(cn10k_sso_hws_reas_deq_##name, flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_32_47
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn10k/deq_32_47_seg.c b/drivers/event/cnxk/deq/cn10k/deq_32_47_seg.c
deleted file mode 100644
index 8ce1875e98..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_32_47_seg.c
+++ /dev/null
@@ -1,20 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags)                                                         \
-	SSO_DEQ_SEG(cn10k_sso_hws_deq_seg_##name, flags)                       \
-	SSO_DEQ_SEG(cn10k_sso_hws_reas_deq_seg_##name, flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_32_47
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn10k/deq_32_47_tmo.c b/drivers/event/cnxk/deq/cn10k/deq_32_47_tmo.c
deleted file mode 100644
index d1dabb0bc3..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_32_47_tmo.c
+++ /dev/null
@@ -1,20 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags)                                                         \
-	SSO_DEQ_TMO(cn10k_sso_hws_deq_tmo_##name, flags)                       \
-	SSO_DEQ_TMO(cn10k_sso_hws_reas_deq_tmo_##name, flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_32_47
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn10k/deq_32_47_tmo_seg.c b/drivers/event/cnxk/deq/cn10k/deq_32_47_tmo_seg.c
deleted file mode 100644
index a8d0240871..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_32_47_tmo_seg.c
+++ /dev/null
@@ -1,21 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags)                                                         \
-	SSO_DEQ_TMO_SEG(cn10k_sso_hws_deq_tmo_seg_##name, flags)               \
-	SSO_DEQ_TMO_SEG(cn10k_sso_hws_reas_deq_tmo_seg_##name,                 \
-			flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_32_47
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn10k/deq_48_63.c b/drivers/event/cnxk/deq/cn10k/deq_48_63.c
deleted file mode 100644
index 7a8c548e60..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_48_63.c
+++ /dev/null
@@ -1,20 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags)                                                         \
-	SSO_DEQ(cn10k_sso_hws_deq_##name, flags)                               \
-	SSO_DEQ(cn10k_sso_hws_reas_deq_##name, flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_48_63
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn10k/deq_48_63_seg.c b/drivers/event/cnxk/deq/cn10k/deq_48_63_seg.c
deleted file mode 100644
index 7a85c7a7ba..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_48_63_seg.c
+++ /dev/null
@@ -1,20 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags)                                                         \
-	SSO_DEQ_SEG(cn10k_sso_hws_deq_seg_##name, flags)                       \
-	SSO_DEQ_SEG(cn10k_sso_hws_reas_deq_seg_##name, flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_48_63
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn10k/deq_48_63_tmo.c b/drivers/event/cnxk/deq/cn10k/deq_48_63_tmo.c
deleted file mode 100644
index 12d045d429..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_48_63_tmo.c
+++ /dev/null
@@ -1,20 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags)                                                         \
-	SSO_DEQ_TMO(cn10k_sso_hws_deq_tmo_##name, flags)                       \
-	SSO_DEQ_TMO(cn10k_sso_hws_reas_deq_tmo_##name, flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_48_63
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn10k/deq_48_63_tmo_seg.c b/drivers/event/cnxk/deq/cn10k/deq_48_63_tmo_seg.c
deleted file mode 100644
index d8e03e2b9c..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_48_63_tmo_seg.c
+++ /dev/null
@@ -1,21 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags)                                                         \
-	SSO_DEQ_TMO_SEG(cn10k_sso_hws_deq_tmo_seg_##name, flags)               \
-	SSO_DEQ_TMO_SEG(cn10k_sso_hws_reas_deq_tmo_seg_##name,                 \
-			flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_48_63
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn10k/deq_64_79.c b/drivers/event/cnxk/deq/cn10k/deq_64_79.c
deleted file mode 100644
index b429886634..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_64_79.c
+++ /dev/null
@@ -1,20 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags)                                                         \
-	SSO_DEQ(cn10k_sso_hws_deq_##name, flags)                               \
-	SSO_DEQ(cn10k_sso_hws_reas_deq_##name, flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_64_79
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn10k/deq_64_79_seg.c b/drivers/event/cnxk/deq/cn10k/deq_64_79_seg.c
deleted file mode 100644
index 6c01a9cce1..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_64_79_seg.c
+++ /dev/null
@@ -1,20 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags)                                                         \
-	SSO_DEQ_SEG(cn10k_sso_hws_deq_seg_##name, flags)                       \
-	SSO_DEQ_SEG(cn10k_sso_hws_reas_deq_seg_##name, flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_64_79
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn10k/deq_64_79_tmo.c b/drivers/event/cnxk/deq/cn10k/deq_64_79_tmo.c
deleted file mode 100644
index 3b08f65652..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_64_79_tmo.c
+++ /dev/null
@@ -1,20 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags)                                                         \
-	SSO_DEQ_TMO(cn10k_sso_hws_deq_tmo_##name, flags)                       \
-	SSO_DEQ_TMO(cn10k_sso_hws_reas_deq_tmo_##name, flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_64_79
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn10k/deq_64_79_tmo_seg.c b/drivers/event/cnxk/deq/cn10k/deq_64_79_tmo_seg.c
deleted file mode 100644
index d3dad21179..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_64_79_tmo_seg.c
+++ /dev/null
@@ -1,20 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags)                                                         \
-	SSO_DEQ_TMO_SEG(cn10k_sso_hws_deq_tmo_seg_##name, flags)               \
-	SSO_DEQ_TMO_SEG(cn10k_sso_hws_reas_deq_tmo_seg_##name, flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_64_79
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn10k/deq_80_95.c b/drivers/event/cnxk/deq/cn10k/deq_80_95.c
deleted file mode 100644
index 22333b5928..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_80_95.c
+++ /dev/null
@@ -1,20 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags)                                                         \
-	SSO_DEQ(cn10k_sso_hws_deq_##name, flags)                               \
-	SSO_DEQ(cn10k_sso_hws_reas_deq_##name, flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_80_95
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn10k/deq_80_95_seg.c b/drivers/event/cnxk/deq/cn10k/deq_80_95_seg.c
deleted file mode 100644
index 9c0cdce7b8..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_80_95_seg.c
+++ /dev/null
@@ -1,20 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags)                                                         \
-	SSO_DEQ_SEG(cn10k_sso_hws_deq_seg_##name, flags)                       \
-	SSO_DEQ_SEG(cn10k_sso_hws_reas_deq_seg_##name, flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_80_95
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn10k/deq_80_95_tmo.c b/drivers/event/cnxk/deq/cn10k/deq_80_95_tmo.c
deleted file mode 100644
index 31c18af76a..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_80_95_tmo.c
+++ /dev/null
@@ -1,20 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags)                                                         \
-	SSO_DEQ_TMO(cn10k_sso_hws_deq_tmo_##name, flags)                       \
-	SSO_DEQ_TMO(cn10k_sso_hws_reas_deq_tmo_##name, flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_80_95
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn10k/deq_80_95_tmo_seg.c b/drivers/event/cnxk/deq/cn10k/deq_80_95_tmo_seg.c
deleted file mode 100644
index 3a7e93ff4c..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_80_95_tmo_seg.c
+++ /dev/null
@@ -1,20 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags)                                                         \
-	SSO_DEQ_TMO_SEG(cn10k_sso_hws_deq_tmo_seg_##name, flags)               \
-	SSO_DEQ_TMO_SEG(cn10k_sso_hws_reas_deq_tmo_seg_##name, flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_80_95
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn10k/deq_96_111.c b/drivers/event/cnxk/deq/cn10k/deq_96_111.c
deleted file mode 100644
index 4478d0475d..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_96_111.c
+++ /dev/null
@@ -1,20 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags)                                                         \
-	SSO_DEQ(cn10k_sso_hws_deq_##name, flags)                               \
-	SSO_DEQ(cn10k_sso_hws_reas_deq_##name, flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_96_111
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn10k/deq_96_111_seg.c b/drivers/event/cnxk/deq/cn10k/deq_96_111_seg.c
deleted file mode 100644
index be97fbcf60..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_96_111_seg.c
+++ /dev/null
@@ -1,20 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags)                                                         \
-	SSO_DEQ_SEG(cn10k_sso_hws_deq_seg_##name, flags)                       \
-	SSO_DEQ_SEG(cn10k_sso_hws_reas_deq_seg_##name, flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_96_111
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn10k/deq_96_111_tmo.c b/drivers/event/cnxk/deq/cn10k/deq_96_111_tmo.c
deleted file mode 100644
index cb90b5c31a..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_96_111_tmo.c
+++ /dev/null
@@ -1,20 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags)                                                         \
-	SSO_DEQ_TMO(cn10k_sso_hws_deq_tmo_##name, flags)                       \
-	SSO_DEQ_TMO(cn10k_sso_hws_reas_deq_tmo_##name, flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_96_111
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn10k/deq_96_111_tmo_seg.c b/drivers/event/cnxk/deq/cn10k/deq_96_111_tmo_seg.c
deleted file mode 100644
index 9a3d09fae7..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_96_111_tmo_seg.c
+++ /dev/null
@@ -1,20 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags)                                                         \
-	SSO_DEQ_TMO_SEG(cn10k_sso_hws_deq_tmo_seg_##name, flags)               \
-	SSO_DEQ_TMO_SEG(cn10k_sso_hws_reas_deq_tmo_seg_##name, flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_96_111
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn10k/deq_all_offload.c b/drivers/event/cnxk/deq/cn10k/deq_all_offload.c
index 1d0ad548a6..c556f0358e 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_all_offload.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_all_offload.c
@@ -11,7 +11,8 @@ 
 #if defined(CNXK_DIS_TMPLT_FUNC)

 uint16_t __rte_hot
-cn10k_sso_hws_deq_all_offload(void *port, struct rte_event *ev, uint64_t timeout_ticks)
+cn10k_sso_hws_deq_burst_all_offload(void *port, struct rte_event ev[], uint16_t nb_events,
+				    uint64_t timeout_ticks)
 {
 	const uint32_t flags = (NIX_RX_OFFLOAD_RSS_F | NIX_RX_OFFLOAD_PTYPE_F |
 				NIX_RX_OFFLOAD_CHECKSUM_F | NIX_RX_OFFLOAD_MARK_UPDATE_F |
@@ -21,6 +22,7 @@  cn10k_sso_hws_deq_all_offload(void *port, struct rte_event *ev, uint64_t timeout
 	uint16_t ret = 1;
 	uint64_t iter;

+	RTE_SET_USED(nb_events);
 	if (ws->swtag_req) {
 		ws->swtag_req = 0;
 		ws->gw_rdata = cnxk_sso_hws_swtag_wait(ws->base + SSOW_LF_GWS_WQE0);
@@ -35,7 +37,8 @@  cn10k_sso_hws_deq_all_offload(void *port, struct rte_event *ev, uint64_t timeout
 }

 uint16_t __rte_hot
-cn10k_sso_hws_deq_all_offload_tst(void *port, struct rte_event *ev, uint64_t timeout_ticks)
+cn10k_sso_hws_deq_burst_all_offload_tst(void *port, struct rte_event ev[], uint16_t nb_events,
+					uint64_t timeout_ticks)
 {
 	const uint32_t flags = (NIX_RX_OFFLOAD_RSS_F | NIX_RX_OFFLOAD_PTYPE_F |
 				NIX_RX_OFFLOAD_CHECKSUM_F | NIX_RX_OFFLOAD_MARK_UPDATE_F |
@@ -45,6 +48,7 @@  cn10k_sso_hws_deq_all_offload_tst(void *port, struct rte_event *ev, uint64_t tim
 	uint16_t ret = 1;
 	uint64_t iter;

+	RTE_SET_USED(nb_events);
 	if (ws->swtag_req) {
 		ws->swtag_req = 0;
 		ws->gw_rdata = cnxk_sso_hws_swtag_wait(ws->base + SSOW_LF_GWS_WQE0);
@@ -58,20 +62,4 @@  cn10k_sso_hws_deq_all_offload_tst(void *port, struct rte_event *ev, uint64_t tim
 	return ret;
 }

-uint16_t __rte_hot
-cn10k_sso_hws_deq_burst_all_offload(void *port, struct rte_event ev[], uint16_t nb_events,
-				    uint64_t timeout_ticks)
-{
-	RTE_SET_USED(nb_events);
-	return cn10k_sso_hws_deq_all_offload(port, ev, timeout_ticks);
-}
-
-uint16_t __rte_hot
-cn10k_sso_hws_deq_burst_all_offload_tst(void *port, struct rte_event ev[], uint16_t nb_events,
-				    uint64_t timeout_ticks)
-{
-	RTE_SET_USED(nb_events);
-	return cn10k_sso_hws_deq_all_offload_tst(port, ev, timeout_ticks);
-}
-
 #endif
diff --git a/drivers/event/cnxk/deq/cn9k/deq_0_15.c b/drivers/event/cnxk/deq/cn9k/deq_0_15.c
deleted file mode 100644
index 8254fad3a2..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_0_15.c
+++ /dev/null
@@ -1,16 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags) SSO_DEQ(cn9k_sso_hws_deq_##name, flags)
-
-NIX_RX_FASTPATH_MODES_0_15
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn9k/deq_0_15_dual.c b/drivers/event/cnxk/deq/cn9k/deq_0_15_dual.c
deleted file mode 100644
index 91a69ea0d7..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_0_15_dual.c
+++ /dev/null
@@ -1,16 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags) SSO_DUAL_DEQ(cn9k_sso_hws_dual_deq_##name, flags)
-
-NIX_RX_FASTPATH_MODES_0_15
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn9k/deq_0_15_dual_seg.c b/drivers/event/cnxk/deq/cn9k/deq_0_15_dual_seg.c
deleted file mode 100644
index 8a1dfceb14..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_0_15_dual_seg.c
+++ /dev/null
@@ -1,16 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags) SSO_DUAL_DEQ_SEG(cn9k_sso_hws_dual_deq_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_0_15
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn9k/deq_0_15_dual_tmo.c b/drivers/event/cnxk/deq/cn9k/deq_0_15_dual_tmo.c
deleted file mode 100644
index 6028dd679a..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_0_15_dual_tmo.c
+++ /dev/null
@@ -1,16 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags) SSO_DUAL_DEQ_TMO(cn9k_sso_hws_dual_deq_tmo_##name, flags)
-
-NIX_RX_FASTPATH_MODES_0_15
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn9k/deq_0_15_dual_tmo_seg.c b/drivers/event/cnxk/deq/cn9k/deq_0_15_dual_tmo_seg.c
deleted file mode 100644
index 55405b0f7b..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_0_15_dual_tmo_seg.c
+++ /dev/null
@@ -1,17 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags)                                                         \
-	SSO_DUAL_DEQ_TMO_SEG(cn9k_sso_hws_dual_deq_tmo_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_0_15
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn9k/deq_0_15_seg.c b/drivers/event/cnxk/deq/cn9k/deq_0_15_seg.c
deleted file mode 100644
index 5d01377d77..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_0_15_seg.c
+++ /dev/null
@@ -1,16 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags) SSO_DEQ_SEG(cn9k_sso_hws_deq_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_0_15
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn9k/deq_0_15_tmo.c b/drivers/event/cnxk/deq/cn9k/deq_0_15_tmo.c
deleted file mode 100644
index b7d566f2f1..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_0_15_tmo.c
+++ /dev/null
@@ -1,16 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags) SSO_DEQ_TMO(cn9k_sso_hws_deq_tmo_##name, flags)
-
-NIX_RX_FASTPATH_MODES_0_15
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn9k/deq_0_15_tmo_seg.c b/drivers/event/cnxk/deq/cn9k/deq_0_15_tmo_seg.c
deleted file mode 100644
index ea83fe83d4..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_0_15_tmo_seg.c
+++ /dev/null
@@ -1,16 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags) SSO_DEQ_TMO_SEG(cn9k_sso_hws_deq_tmo_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_0_15
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn9k/deq_112_127.c b/drivers/event/cnxk/deq/cn9k/deq_112_127.c
deleted file mode 100644
index 63d06f41cb..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_112_127.c
+++ /dev/null
@@ -1,16 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags) SSO_DEQ(cn9k_sso_hws_deq_##name, flags)
-
-NIX_RX_FASTPATH_MODES_112_127
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn9k/deq_112_127_dual.c b/drivers/event/cnxk/deq/cn9k/deq_112_127_dual.c
deleted file mode 100644
index 766c02df2a..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_112_127_dual.c
+++ /dev/null
@@ -1,16 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags) SSO_DUAL_DEQ(cn9k_sso_hws_dual_deq_##name, flags)
-
-NIX_RX_FASTPATH_MODES_112_127
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn9k/deq_112_127_dual_seg.c b/drivers/event/cnxk/deq/cn9k/deq_112_127_dual_seg.c
deleted file mode 100644
index f452db50c1..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_112_127_dual_seg.c
+++ /dev/null
@@ -1,16 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags) SSO_DUAL_DEQ_SEG(cn9k_sso_hws_dual_deq_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_112_127
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn9k/deq_112_127_dual_tmo.c b/drivers/event/cnxk/deq/cn9k/deq_112_127_dual_tmo.c
deleted file mode 100644
index 0b549f5214..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_112_127_dual_tmo.c
+++ /dev/null
@@ -1,16 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags) SSO_DUAL_DEQ_TMO(cn9k_sso_hws_dual_deq_tmo_##name, flags)
-
-NIX_RX_FASTPATH_MODES_112_127
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn9k/deq_112_127_dual_tmo_seg.c b/drivers/event/cnxk/deq/cn9k/deq_112_127_dual_tmo_seg.c
deleted file mode 100644
index 9dd678843f..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_112_127_dual_tmo_seg.c
+++ /dev/null
@@ -1,17 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags)                                                         \
-	SSO_DUAL_DEQ_TMO_SEG(cn9k_sso_hws_dual_deq_tmo_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_112_127
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn9k/deq_112_127_seg.c b/drivers/event/cnxk/deq/cn9k/deq_112_127_seg.c
deleted file mode 100644
index 090730be2e..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_112_127_seg.c
+++ /dev/null
@@ -1,16 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags) SSO_DEQ_SEG(cn9k_sso_hws_deq_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_112_127
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn9k/deq_112_127_tmo.c b/drivers/event/cnxk/deq/cn9k/deq_112_127_tmo.c
deleted file mode 100644
index 7796446dc5..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_112_127_tmo.c
+++ /dev/null
@@ -1,16 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags) SSO_DEQ_TMO(cn9k_sso_hws_deq_tmo_##name, flags)
-
-NIX_RX_FASTPATH_MODES_112_127
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn9k/deq_112_127_tmo_seg.c b/drivers/event/cnxk/deq/cn9k/deq_112_127_tmo_seg.c
deleted file mode 100644
index 125d27f098..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_112_127_tmo_seg.c
+++ /dev/null
@@ -1,16 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags) SSO_DEQ_TMO_SEG(cn9k_sso_hws_deq_tmo_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_112_127
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn9k/deq_16_31.c b/drivers/event/cnxk/deq/cn9k/deq_16_31.c
deleted file mode 100644
index be209d9e09..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_16_31.c
+++ /dev/null
@@ -1,16 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags) SSO_DEQ(cn9k_sso_hws_deq_##name, flags)
-
-NIX_RX_FASTPATH_MODES_16_31
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn9k/deq_16_31_dual.c b/drivers/event/cnxk/deq/cn9k/deq_16_31_dual.c
deleted file mode 100644
index c214893f2d..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_16_31_dual.c
+++ /dev/null
@@ -1,16 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags) SSO_DUAL_DEQ(cn9k_sso_hws_dual_deq_##name, flags)
-
-NIX_RX_FASTPATH_MODES_16_31
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn9k/deq_16_31_dual_seg.c b/drivers/event/cnxk/deq/cn9k/deq_16_31_dual_seg.c
deleted file mode 100644
index bd1ce1a7fa..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_16_31_dual_seg.c
+++ /dev/null
@@ -1,16 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags) SSO_DUAL_DEQ_SEG(cn9k_sso_hws_dual_deq_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_16_31
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn9k/deq_16_31_dual_tmo.c b/drivers/event/cnxk/deq/cn9k/deq_16_31_dual_tmo.c
deleted file mode 100644
index 0c163186da..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_16_31_dual_tmo.c
+++ /dev/null
@@ -1,16 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags) SSO_DUAL_DEQ_TMO(cn9k_sso_hws_dual_deq_tmo_##name, flags)
-
-NIX_RX_FASTPATH_MODES_16_31
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn9k/deq_16_31_dual_tmo_seg.c b/drivers/event/cnxk/deq/cn9k/deq_16_31_dual_tmo_seg.c
deleted file mode 100644
index 542dc51e11..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_16_31_dual_tmo_seg.c
+++ /dev/null
@@ -1,17 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags)                                                         \
-	SSO_DUAL_DEQ_TMO_SEG(cn9k_sso_hws_dual_deq_tmo_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_16_31
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn9k/deq_16_31_seg.c b/drivers/event/cnxk/deq/cn9k/deq_16_31_seg.c
deleted file mode 100644
index 86302a6a12..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_16_31_seg.c
+++ /dev/null
@@ -1,16 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags) SSO_DEQ_SEG(cn9k_sso_hws_deq_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_16_31
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn9k/deq_16_31_tmo.c b/drivers/event/cnxk/deq/cn9k/deq_16_31_tmo.c
deleted file mode 100644
index c3018902fd..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_16_31_tmo.c
+++ /dev/null
@@ -1,16 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags) SSO_DEQ_TMO(cn9k_sso_hws_deq_tmo_##name, flags)
-
-NIX_RX_FASTPATH_MODES_16_31
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn9k/deq_16_31_tmo_seg.c b/drivers/event/cnxk/deq/cn9k/deq_16_31_tmo_seg.c
deleted file mode 100644
index 2518dffe50..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_16_31_tmo_seg.c
+++ /dev/null
@@ -1,16 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags) SSO_DEQ_TMO_SEG(cn9k_sso_hws_deq_tmo_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_16_31
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn9k/deq_32_47.c b/drivers/event/cnxk/deq/cn9k/deq_32_47.c
deleted file mode 100644
index 1167097c6c..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_32_47.c
+++ /dev/null
@@ -1,16 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags) SSO_DEQ(cn9k_sso_hws_deq_##name, flags)
-
-NIX_RX_FASTPATH_MODES_32_47
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn9k/deq_32_47_dual.c b/drivers/event/cnxk/deq/cn9k/deq_32_47_dual.c
deleted file mode 100644
index d51fdd88b5..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_32_47_dual.c
+++ /dev/null
@@ -1,16 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags) SSO_DUAL_DEQ(cn9k_sso_hws_dual_deq_##name, flags)
-
-NIX_RX_FASTPATH_MODES_32_47
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn9k/deq_32_47_dual_seg.c b/drivers/event/cnxk/deq/cn9k/deq_32_47_dual_seg.c
deleted file mode 100644
index f465582540..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_32_47_dual_seg.c
+++ /dev/null
@@ -1,16 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags) SSO_DUAL_DEQ_SEG(cn9k_sso_hws_dual_deq_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_32_47
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn9k/deq_32_47_dual_tmo.c b/drivers/event/cnxk/deq/cn9k/deq_32_47_dual_tmo.c
deleted file mode 100644
index 6afdcc26a0..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_32_47_dual_tmo.c
+++ /dev/null
@@ -1,16 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags) SSO_DUAL_DEQ_TMO(cn9k_sso_hws_dual_deq_tmo_##name, flags)
-
-NIX_RX_FASTPATH_MODES_32_47
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn9k/deq_32_47_dual_tmo_seg.c b/drivers/event/cnxk/deq/cn9k/deq_32_47_dual_tmo_seg.c
deleted file mode 100644
index 016f410e48..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_32_47_dual_tmo_seg.c
+++ /dev/null
@@ -1,17 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags)                                                         \
-	SSO_DUAL_DEQ_TMO_SEG(cn9k_sso_hws_dual_deq_tmo_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_32_47
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn9k/deq_32_47_seg.c b/drivers/event/cnxk/deq/cn9k/deq_32_47_seg.c
deleted file mode 100644
index c00a5749cc..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_32_47_seg.c
+++ /dev/null
@@ -1,16 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags) SSO_DEQ_SEG(cn9k_sso_hws_deq_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_32_47
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn9k/deq_32_47_tmo.c b/drivers/event/cnxk/deq/cn9k/deq_32_47_tmo.c
deleted file mode 100644
index 5345264883..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_32_47_tmo.c
+++ /dev/null
@@ -1,16 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags) SSO_DEQ_TMO(cn9k_sso_hws_deq_tmo_##name, flags)
-
-NIX_RX_FASTPATH_MODES_32_47
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn9k/deq_32_47_tmo_seg.c b/drivers/event/cnxk/deq/cn9k/deq_32_47_tmo_seg.c
deleted file mode 100644
index 94c7b08638..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_32_47_tmo_seg.c
+++ /dev/null
@@ -1,16 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags) SSO_DEQ_TMO_SEG(cn9k_sso_hws_deq_tmo_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_32_47
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn9k/deq_48_63.c b/drivers/event/cnxk/deq/cn9k/deq_48_63.c
deleted file mode 100644
index 6e2e6e49cc..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_48_63.c
+++ /dev/null
@@ -1,16 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags) SSO_DEQ(cn9k_sso_hws_deq_##name, flags)
-
-NIX_RX_FASTPATH_MODES_48_63
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn9k/deq_48_63_dual.c b/drivers/event/cnxk/deq/cn9k/deq_48_63_dual.c
deleted file mode 100644
index cdc1defebf..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_48_63_dual.c
+++ /dev/null
@@ -1,16 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags) SSO_DUAL_DEQ(cn9k_sso_hws_dual_deq_##name, flags)
-
-NIX_RX_FASTPATH_MODES_48_63
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn9k/deq_48_63_dual_seg.c b/drivers/event/cnxk/deq/cn9k/deq_48_63_dual_seg.c
deleted file mode 100644
index 49efa68b16..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_48_63_dual_seg.c
+++ /dev/null
@@ -1,16 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags) SSO_DUAL_DEQ_SEG(cn9k_sso_hws_dual_deq_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_48_63
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn9k/deq_48_63_dual_tmo.c b/drivers/event/cnxk/deq/cn9k/deq_48_63_dual_tmo.c
deleted file mode 100644
index bd31462d96..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_48_63_dual_tmo.c
+++ /dev/null
@@ -1,16 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags) SSO_DUAL_DEQ_TMO(cn9k_sso_hws_dual_deq_tmo_##name, flags)
-
-NIX_RX_FASTPATH_MODES_48_63
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn9k/deq_48_63_dual_tmo_seg.c b/drivers/event/cnxk/deq/cn9k/deq_48_63_dual_tmo_seg.c
deleted file mode 100644
index cd047f48e5..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_48_63_dual_tmo_seg.c
+++ /dev/null
@@ -1,17 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags)                                                         \
-	SSO_DUAL_DEQ_TMO_SEG(cn9k_sso_hws_dual_deq_tmo_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_48_63
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn9k/deq_48_63_seg.c b/drivers/event/cnxk/deq/cn9k/deq_48_63_seg.c
deleted file mode 100644
index b485d2163e..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_48_63_seg.c
+++ /dev/null
@@ -1,16 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags) SSO_DEQ_SEG(cn9k_sso_hws_deq_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_48_63
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn9k/deq_48_63_tmo.c b/drivers/event/cnxk/deq/cn9k/deq_48_63_tmo.c
deleted file mode 100644
index 10de29e85d..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_48_63_tmo.c
+++ /dev/null
@@ -1,16 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags) SSO_DEQ_TMO(cn9k_sso_hws_deq_tmo_##name, flags)
-
-NIX_RX_FASTPATH_MODES_48_63
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn9k/deq_48_63_tmo_seg.c b/drivers/event/cnxk/deq/cn9k/deq_48_63_tmo_seg.c
deleted file mode 100644
index b553d2dc53..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_48_63_tmo_seg.c
+++ /dev/null
@@ -1,16 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags) SSO_DEQ_TMO_SEG(cn9k_sso_hws_deq_tmo_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_48_63
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn9k/deq_64_79.c b/drivers/event/cnxk/deq/cn9k/deq_64_79.c
deleted file mode 100644
index 169c4244d9..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_64_79.c
+++ /dev/null
@@ -1,16 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags) SSO_DEQ(cn9k_sso_hws_deq_##name, flags)
-
-NIX_RX_FASTPATH_MODES_64_79
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn9k/deq_64_79_dual.c b/drivers/event/cnxk/deq/cn9k/deq_64_79_dual.c
deleted file mode 100644
index 4f1c6624ed..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_64_79_dual.c
+++ /dev/null
@@ -1,16 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags) SSO_DUAL_DEQ(cn9k_sso_hws_dual_deq_##name, flags)
-
-NIX_RX_FASTPATH_MODES_64_79
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn9k/deq_64_79_dual_seg.c b/drivers/event/cnxk/deq/cn9k/deq_64_79_dual_seg.c
deleted file mode 100644
index b5382fc908..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_64_79_dual_seg.c
+++ /dev/null
@@ -1,16 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags) SSO_DUAL_DEQ_SEG(cn9k_sso_hws_dual_deq_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_64_79
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn9k/deq_64_79_dual_tmo.c b/drivers/event/cnxk/deq/cn9k/deq_64_79_dual_tmo.c
deleted file mode 100644
index 68aeb1b0d5..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_64_79_dual_tmo.c
+++ /dev/null
@@ -1,16 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags) SSO_DUAL_DEQ_TMO(cn9k_sso_hws_dual_deq_tmo_##name, flags)
-
-NIX_RX_FASTPATH_MODES_64_79
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn9k/deq_64_79_dual_tmo_seg.c b/drivers/event/cnxk/deq/cn9k/deq_64_79_dual_tmo_seg.c
deleted file mode 100644
index 763568e25a..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_64_79_dual_tmo_seg.c
+++ /dev/null
@@ -1,17 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags)                                                         \
-	SSO_DUAL_DEQ_TMO_SEG(cn9k_sso_hws_dual_deq_tmo_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_64_79
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn9k/deq_64_79_seg.c b/drivers/event/cnxk/deq/cn9k/deq_64_79_seg.c
deleted file mode 100644
index 98d7a31a4a..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_64_79_seg.c
+++ /dev/null
@@ -1,16 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags) SSO_DEQ_SEG(cn9k_sso_hws_deq_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_64_79
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn9k/deq_64_79_tmo.c b/drivers/event/cnxk/deq/cn9k/deq_64_79_tmo.c
deleted file mode 100644
index b79dc6a7c1..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_64_79_tmo.c
+++ /dev/null
@@ -1,16 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags) SSO_DEQ_TMO(cn9k_sso_hws_deq_tmo_##name, flags)
-
-NIX_RX_FASTPATH_MODES_64_79
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn9k/deq_64_79_tmo_seg.c b/drivers/event/cnxk/deq/cn9k/deq_64_79_tmo_seg.c
deleted file mode 100644
index 92c9400d91..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_64_79_tmo_seg.c
+++ /dev/null
@@ -1,16 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags) SSO_DEQ_TMO_SEG(cn9k_sso_hws_deq_tmo_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_64_79
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn9k/deq_80_95.c b/drivers/event/cnxk/deq/cn9k/deq_80_95.c
deleted file mode 100644
index 64000836c2..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_80_95.c
+++ /dev/null
@@ -1,16 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags) SSO_DEQ(cn9k_sso_hws_deq_##name, flags)
-
-NIX_RX_FASTPATH_MODES_80_95
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn9k/deq_80_95_dual.c b/drivers/event/cnxk/deq/cn9k/deq_80_95_dual.c
deleted file mode 100644
index c69d2f4100..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_80_95_dual.c
+++ /dev/null
@@ -1,16 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags) SSO_DUAL_DEQ(cn9k_sso_hws_dual_deq_##name, flags)
-
-NIX_RX_FASTPATH_MODES_80_95
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn9k/deq_80_95_dual_seg.c b/drivers/event/cnxk/deq/cn9k/deq_80_95_dual_seg.c
deleted file mode 100644
index f232d36778..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_80_95_dual_seg.c
+++ /dev/null
@@ -1,16 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags) SSO_DUAL_DEQ_SEG(cn9k_sso_hws_dual_deq_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_80_95
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn9k/deq_80_95_dual_tmo.c b/drivers/event/cnxk/deq/cn9k/deq_80_95_dual_tmo.c
deleted file mode 100644
index 948695fcf8..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_80_95_dual_tmo.c
+++ /dev/null
@@ -1,16 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags) SSO_DUAL_DEQ_TMO(cn9k_sso_hws_dual_deq_tmo_##name, flags)
-
-NIX_RX_FASTPATH_MODES_80_95
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn9k/deq_80_95_dual_tmo_seg.c b/drivers/event/cnxk/deq/cn9k/deq_80_95_dual_tmo_seg.c
deleted file mode 100644
index d3055e348b..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_80_95_dual_tmo_seg.c
+++ /dev/null
@@ -1,17 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags)                                                         \
-	SSO_DUAL_DEQ_TMO_SEG(cn9k_sso_hws_dual_deq_tmo_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_80_95
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn9k/deq_80_95_seg.c b/drivers/event/cnxk/deq/cn9k/deq_80_95_seg.c
deleted file mode 100644
index 76bef5e3a8..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_80_95_seg.c
+++ /dev/null
@@ -1,16 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags) SSO_DEQ_SEG(cn9k_sso_hws_deq_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_80_95
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn9k/deq_80_95_tmo.c b/drivers/event/cnxk/deq/cn9k/deq_80_95_tmo.c
deleted file mode 100644
index 0c1bc7bf42..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_80_95_tmo.c
+++ /dev/null
@@ -1,16 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags) SSO_DEQ_TMO(cn9k_sso_hws_deq_tmo_##name, flags)
-
-NIX_RX_FASTPATH_MODES_80_95
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn9k/deq_80_95_tmo_seg.c b/drivers/event/cnxk/deq/cn9k/deq_80_95_tmo_seg.c
deleted file mode 100644
index 2a8f42af79..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_80_95_tmo_seg.c
+++ /dev/null
@@ -1,16 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags) SSO_DEQ_TMO_SEG(cn9k_sso_hws_deq_tmo_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_80_95
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn9k/deq_96_111.c b/drivers/event/cnxk/deq/cn9k/deq_96_111.c
deleted file mode 100644
index a2eed2643b..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_96_111.c
+++ /dev/null
@@ -1,16 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags) SSO_DEQ(cn9k_sso_hws_deq_##name, flags)
-
-NIX_RX_FASTPATH_MODES_96_111
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn9k/deq_96_111_dual.c b/drivers/event/cnxk/deq/cn9k/deq_96_111_dual.c
deleted file mode 100644
index 706ecee7e8..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_96_111_dual.c
+++ /dev/null
@@ -1,16 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags) SSO_DUAL_DEQ(cn9k_sso_hws_dual_deq_##name, flags)
-
-NIX_RX_FASTPATH_MODES_96_111
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn9k/deq_96_111_dual_seg.c b/drivers/event/cnxk/deq/cn9k/deq_96_111_dual_seg.c
deleted file mode 100644
index f9c71d52b0..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_96_111_dual_seg.c
+++ /dev/null
@@ -1,16 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags) SSO_DUAL_DEQ_SEG(cn9k_sso_hws_dual_deq_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_96_111
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn9k/deq_96_111_dual_tmo.c b/drivers/event/cnxk/deq/cn9k/deq_96_111_dual_tmo.c
deleted file mode 100644
index 0b5eb0fbf8..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_96_111_dual_tmo.c
+++ /dev/null
@@ -1,16 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags) SSO_DUAL_DEQ_TMO(cn9k_sso_hws_dual_deq_tmo_##name, flags)
-
-NIX_RX_FASTPATH_MODES_96_111
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn9k/deq_96_111_dual_tmo_seg.c b/drivers/event/cnxk/deq/cn9k/deq_96_111_dual_tmo_seg.c
deleted file mode 100644
index 8bb6ff5e93..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_96_111_dual_tmo_seg.c
+++ /dev/null
@@ -1,17 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags)                                                         \
-	SSO_DUAL_DEQ_TMO_SEG(cn9k_sso_hws_dual_deq_tmo_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_96_111
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn9k/deq_96_111_seg.c b/drivers/event/cnxk/deq/cn9k/deq_96_111_seg.c
deleted file mode 100644
index ac293a5f5d..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_96_111_seg.c
+++ /dev/null
@@ -1,16 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags) SSO_DEQ_SEG(cn9k_sso_hws_deq_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_96_111
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn9k/deq_96_111_tmo.c b/drivers/event/cnxk/deq/cn9k/deq_96_111_tmo.c
deleted file mode 100644
index 20965f3d3f..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_96_111_tmo.c
+++ /dev/null
@@ -1,16 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags) SSO_DEQ_TMO(cn9k_sso_hws_deq_tmo_##name, flags)
-
-NIX_RX_FASTPATH_MODES_96_111
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn9k/deq_96_111_tmo_seg.c b/drivers/event/cnxk/deq/cn9k/deq_96_111_tmo_seg.c
deleted file mode 100644
index 4fe1e582ff..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_96_111_tmo_seg.c
+++ /dev/null
@@ -1,16 +0,0 @@ 
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#if !defined(CNXK_DIS_TMPLT_FUNC)
-
-#define R(name, flags) SSO_DEQ_TMO_SEG(cn9k_sso_hws_deq_tmo_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_96_111
-#undef R
-
-#endif
diff --git a/drivers/event/cnxk/deq/cn9k/deq_all_offload.c b/drivers/event/cnxk/deq/cn9k/deq_all_offload.c
index f8288fbb4e..f163a05fce 100644
--- a/drivers/event/cnxk/deq/cn9k/deq_all_offload.c
+++ b/drivers/event/cnxk/deq/cn9k/deq_all_offload.c
@@ -9,16 +9,18 @@ 
 #if defined(CNXK_DIS_TMPLT_FUNC)

 uint16_t __rte_hot
-cn9k_sso_hws_deq_all_offload(void *port, struct rte_event *ev, uint64_t timeout_ticks)
+cn9k_sso_hws_deq_burst_all_offload(void *port, struct rte_event ev[], uint16_t nb_events,
+				   uint64_t timeout_ticks)
 {
 	const uint32_t flags =
 		(NIX_RX_OFFLOAD_RSS_F | NIX_RX_OFFLOAD_PTYPE_F | NIX_RX_OFFLOAD_CHECKSUM_F |
 		 NIX_RX_OFFLOAD_MARK_UPDATE_F |
 		 NIX_RX_OFFLOAD_VLAN_STRIP_F | NIX_RX_OFFLOAD_SECURITY_F | NIX_RX_MULTI_SEG_F);
-
 	struct cn9k_sso_hws *ws = port;
 	uint16_t ret = 1;
 	uint64_t iter;
+
+	RTE_SET_USED(nb_events);
 	if (ws->swtag_req) {
 		ws->swtag_req = 0;
 		cnxk_sso_hws_swtag_wait(ws->base + SSOW_LF_GWS_TAG);
@@ -31,7 +33,8 @@  cn9k_sso_hws_deq_all_offload(void *port, struct rte_event *ev, uint64_t timeout_
 }

 uint16_t __rte_hot
-cn9k_sso_hws_deq_dual_all_offload(void *port, struct rte_event *ev, uint64_t timeout_ticks)
+cn9k_sso_hws_deq_dual_burst_all_offload(void *port, struct rte_event ev[], uint16_t nb_events,
+					uint64_t timeout_ticks)
 {
 	const uint32_t flags =
 		(NIX_RX_OFFLOAD_RSS_F | NIX_RX_OFFLOAD_PTYPE_F | NIX_RX_OFFLOAD_CHECKSUM_F |
@@ -41,6 +44,7 @@  cn9k_sso_hws_deq_dual_all_offload(void *port, struct rte_event *ev, uint64_t tim
 	uint16_t ret = 1;
 	uint64_t iter;

+	RTE_SET_USED(nb_events);
 	if (dws->swtag_req) {
 		dws->swtag_req = 0;
 		cnxk_sso_hws_swtag_wait(dws->base[!dws->vws] + SSOW_LF_GWS_TAG);
@@ -57,7 +61,8 @@  cn9k_sso_hws_deq_dual_all_offload(void *port, struct rte_event *ev, uint64_t tim
 }

 uint16_t __rte_hot
-cn9k_sso_hws_deq_all_offload_tst(void *port, struct rte_event *ev, uint64_t timeout_ticks)
+cn9k_sso_hws_deq_burst_all_offload_tst(void *port, struct rte_event ev[], uint16_t nb_events,
+				       uint64_t timeout_ticks)
 {
 	const uint32_t flags =
 		(NIX_RX_OFFLOAD_RSS_F | NIX_RX_OFFLOAD_PTYPE_F | NIX_RX_OFFLOAD_CHECKSUM_F |
@@ -67,6 +72,8 @@  cn9k_sso_hws_deq_all_offload_tst(void *port, struct rte_event *ev, uint64_t time
 	struct cn9k_sso_hws *ws = port;
 	uint16_t ret = 1;
 	uint64_t iter;
+
+	RTE_SET_USED(nb_events);
 	if (ws->swtag_req) {
 		ws->swtag_req = 0;
 		cnxk_sso_hws_swtag_wait(ws->base + SSOW_LF_GWS_TAG);
@@ -79,7 +86,8 @@  cn9k_sso_hws_deq_all_offload_tst(void *port, struct rte_event *ev, uint64_t time
 }

 uint16_t __rte_hot
-cn9k_sso_hws_deq_dual_all_offload_tst(void *port, struct rte_event *ev, uint64_t timeout_ticks)
+cn9k_sso_hws_deq_dual_burst_all_offload_tst(void *port, struct rte_event ev[], uint16_t nb_events,
+					    uint64_t timeout_ticks)
 {
 	const uint32_t flags =
 		(NIX_RX_OFFLOAD_RSS_F | NIX_RX_OFFLOAD_PTYPE_F | NIX_RX_OFFLOAD_CHECKSUM_F |
@@ -89,6 +97,7 @@  cn9k_sso_hws_deq_dual_all_offload_tst(void *port, struct rte_event *ev, uint64_t
 	uint16_t ret = 1;
 	uint64_t iter;

+	RTE_SET_USED(nb_events);
 	if (dws->swtag_req) {
 		dws->swtag_req = 0;
 		cnxk_sso_hws_swtag_wait(dws->base[!dws->vws] + SSOW_LF_GWS_TAG);
@@ -104,36 +113,4 @@  cn9k_sso_hws_deq_dual_all_offload_tst(void *port, struct rte_event *ev, uint64_t
 	return ret;
 }

-uint16_t __rte_hot
-cn9k_sso_hws_deq_burst_all_offload(void *port, struct rte_event ev[], uint16_t nb_events,
-				   uint64_t timeout_ticks)
-{
-	RTE_SET_USED(nb_events);
-	return cn9k_sso_hws_deq_all_offload(port, ev, timeout_ticks);
-}
-
-uint16_t __rte_hot
-cn9k_sso_hws_deq_dual_burst_all_offload(void *port, struct rte_event ev[], uint16_t nb_events,
-					uint64_t timeout_ticks)
-{
-	RTE_SET_USED(nb_events);
-	return cn9k_sso_hws_deq_dual_all_offload(port, ev, timeout_ticks);
-}
-
-uint16_t __rte_hot
-cn9k_sso_hws_deq_burst_all_offload_tst(void *port, struct rte_event ev[], uint16_t nb_events,
-				   uint64_t timeout_ticks)
-{
-	RTE_SET_USED(nb_events);
-	return cn9k_sso_hws_deq_all_offload_tst(port, ev, timeout_ticks);
-}
-
-uint16_t __rte_hot
-cn9k_sso_hws_deq_dual_burst_all_offload_tst(void *port, struct rte_event ev[], uint16_t nb_events,
-					uint64_t timeout_ticks)
-{
-	RTE_SET_USED(nb_events);
-	return cn9k_sso_hws_deq_dual_all_offload_tst(port, ev, timeout_ticks);
-}
-
 #endif
diff --git a/drivers/event/cnxk/meson.build b/drivers/event/cnxk/meson.build
index 2c1060ad87..6757af74bf 100644
--- a/drivers/event/cnxk/meson.build
+++ b/drivers/event/cnxk/meson.build
@@ -59,30 +59,6 @@  sources += files(
         'deq/cn9k/deq_80_95_seg_burst.c',
         'deq/cn9k/deq_96_111_seg_burst.c',
         'deq/cn9k/deq_112_127_seg_burst.c',
-        'deq/cn9k/deq_0_15.c',
-        'deq/cn9k/deq_16_31.c',
-        'deq/cn9k/deq_32_47.c',
-        'deq/cn9k/deq_48_63.c',
-        'deq/cn9k/deq_64_79.c',
-        'deq/cn9k/deq_80_95.c',
-        'deq/cn9k/deq_96_111.c',
-        'deq/cn9k/deq_112_127.c',
-        'deq/cn9k/deq_0_15_seg.c',
-        'deq/cn9k/deq_16_31_seg.c',
-        'deq/cn9k/deq_32_47_seg.c',
-        'deq/cn9k/deq_48_63_seg.c',
-        'deq/cn9k/deq_64_79_seg.c',
-        'deq/cn9k/deq_80_95_seg.c',
-        'deq/cn9k/deq_96_111_seg.c',
-        'deq/cn9k/deq_112_127_seg.c',
-        'deq/cn9k/deq_0_15_tmo.c',
-        'deq/cn9k/deq_16_31_tmo.c',
-        'deq/cn9k/deq_32_47_tmo.c',
-        'deq/cn9k/deq_48_63_tmo.c',
-        'deq/cn9k/deq_64_79_tmo.c',
-        'deq/cn9k/deq_80_95_tmo.c',
-        'deq/cn9k/deq_96_111_tmo.c',
-        'deq/cn9k/deq_112_127_tmo.c',
         'deq/cn9k/deq_0_15_tmo_burst.c',
         'deq/cn9k/deq_16_31_tmo_burst.c',
         'deq/cn9k/deq_32_47_tmo_burst.c',
@@ -91,14 +67,6 @@  sources += files(
         'deq/cn9k/deq_80_95_tmo_burst.c',
         'deq/cn9k/deq_96_111_tmo_burst.c',
         'deq/cn9k/deq_112_127_tmo_burst.c',
-        'deq/cn9k/deq_0_15_tmo_seg.c',
-        'deq/cn9k/deq_16_31_tmo_seg.c',
-        'deq/cn9k/deq_32_47_tmo_seg.c',
-        'deq/cn9k/deq_48_63_tmo_seg.c',
-        'deq/cn9k/deq_64_79_tmo_seg.c',
-        'deq/cn9k/deq_80_95_tmo_seg.c',
-        'deq/cn9k/deq_96_111_tmo_seg.c',
-        'deq/cn9k/deq_112_127_tmo_seg.c',
         'deq/cn9k/deq_0_15_tmo_seg_burst.c',
         'deq/cn9k/deq_16_31_tmo_seg_burst.c',
         'deq/cn9k/deq_32_47_tmo_seg_burst.c',
@@ -126,30 +94,6 @@  sources += files(
         'deq/cn9k/deq_80_95_dual_seg_burst.c',
         'deq/cn9k/deq_96_111_dual_seg_burst.c',
         'deq/cn9k/deq_112_127_dual_seg_burst.c',
-        'deq/cn9k/deq_0_15_dual.c',
-        'deq/cn9k/deq_16_31_dual.c',
-        'deq/cn9k/deq_32_47_dual.c',
-        'deq/cn9k/deq_48_63_dual.c',
-        'deq/cn9k/deq_64_79_dual.c',
-        'deq/cn9k/deq_80_95_dual.c',
-        'deq/cn9k/deq_96_111_dual.c',
-        'deq/cn9k/deq_112_127_dual.c',
-        'deq/cn9k/deq_0_15_dual_seg.c',
-        'deq/cn9k/deq_16_31_dual_seg.c',
-        'deq/cn9k/deq_32_47_dual_seg.c',
-        'deq/cn9k/deq_48_63_dual_seg.c',
-        'deq/cn9k/deq_64_79_dual_seg.c',
-        'deq/cn9k/deq_80_95_dual_seg.c',
-        'deq/cn9k/deq_96_111_dual_seg.c',
-        'deq/cn9k/deq_112_127_dual_seg.c',
-        'deq/cn9k/deq_0_15_dual_tmo.c',
-        'deq/cn9k/deq_16_31_dual_tmo.c',
-        'deq/cn9k/deq_32_47_dual_tmo.c',
-        'deq/cn9k/deq_48_63_dual_tmo.c',
-        'deq/cn9k/deq_64_79_dual_tmo.c',
-        'deq/cn9k/deq_80_95_dual_tmo.c',
-        'deq/cn9k/deq_96_111_dual_tmo.c',
-        'deq/cn9k/deq_112_127_dual_tmo.c',
         'deq/cn9k/deq_0_15_dual_tmo_burst.c',
         'deq/cn9k/deq_16_31_dual_tmo_burst.c',
         'deq/cn9k/deq_32_47_dual_tmo_burst.c',
@@ -158,14 +102,6 @@  sources += files(
         'deq/cn9k/deq_80_95_dual_tmo_burst.c',
         'deq/cn9k/deq_96_111_dual_tmo_burst.c',
         'deq/cn9k/deq_112_127_dual_tmo_burst.c',
-        'deq/cn9k/deq_0_15_dual_tmo_seg.c',
-        'deq/cn9k/deq_16_31_dual_tmo_seg.c',
-        'deq/cn9k/deq_32_47_dual_tmo_seg.c',
-        'deq/cn9k/deq_48_63_dual_tmo_seg.c',
-        'deq/cn9k/deq_64_79_dual_tmo_seg.c',
-        'deq/cn9k/deq_80_95_dual_tmo_seg.c',
-        'deq/cn9k/deq_96_111_dual_tmo_seg.c',
-        'deq/cn9k/deq_112_127_dual_tmo_seg.c',
         'deq/cn9k/deq_0_15_dual_tmo_seg_burst.c',
         'deq/cn9k/deq_16_31_dual_tmo_seg_burst.c',
         'deq/cn9k/deq_32_47_dual_tmo_seg_burst.c',
@@ -247,30 +183,6 @@  sources += files(
         'deq/cn10k/deq_80_95_seg_burst.c',
         'deq/cn10k/deq_96_111_seg_burst.c',
         'deq/cn10k/deq_112_127_seg_burst.c',
-        'deq/cn10k/deq_0_15.c',
-        'deq/cn10k/deq_16_31.c',
-        'deq/cn10k/deq_32_47.c',
-        'deq/cn10k/deq_48_63.c',
-        'deq/cn10k/deq_64_79.c',
-        'deq/cn10k/deq_80_95.c',
-        'deq/cn10k/deq_96_111.c',
-        'deq/cn10k/deq_112_127.c',
-        'deq/cn10k/deq_0_15_seg.c',
-        'deq/cn10k/deq_16_31_seg.c',
-        'deq/cn10k/deq_32_47_seg.c',
-        'deq/cn10k/deq_48_63_seg.c',
-        'deq/cn10k/deq_64_79_seg.c',
-        'deq/cn10k/deq_80_95_seg.c',
-        'deq/cn10k/deq_96_111_seg.c',
-        'deq/cn10k/deq_112_127_seg.c',
-        'deq/cn10k/deq_0_15_tmo.c',
-        'deq/cn10k/deq_16_31_tmo.c',
-        'deq/cn10k/deq_32_47_tmo.c',
-        'deq/cn10k/deq_48_63_tmo.c',
-        'deq/cn10k/deq_64_79_tmo.c',
-        'deq/cn10k/deq_80_95_tmo.c',
-        'deq/cn10k/deq_96_111_tmo.c',
-        'deq/cn10k/deq_112_127_tmo.c',
         'deq/cn10k/deq_0_15_tmo_burst.c',
         'deq/cn10k/deq_16_31_tmo_burst.c',
         'deq/cn10k/deq_32_47_tmo_burst.c',
@@ -279,14 +191,6 @@  sources += files(
         'deq/cn10k/deq_80_95_tmo_burst.c',
         'deq/cn10k/deq_96_111_tmo_burst.c',
         'deq/cn10k/deq_112_127_tmo_burst.c',
-        'deq/cn10k/deq_0_15_tmo_seg.c',
-        'deq/cn10k/deq_16_31_tmo_seg.c',
-        'deq/cn10k/deq_32_47_tmo_seg.c',
-        'deq/cn10k/deq_48_63_tmo_seg.c',
-        'deq/cn10k/deq_64_79_tmo_seg.c',
-        'deq/cn10k/deq_80_95_tmo_seg.c',
-        'deq/cn10k/deq_96_111_tmo_seg.c',
-        'deq/cn10k/deq_112_127_tmo_seg.c',
         'deq/cn10k/deq_0_15_tmo_seg_burst.c',
         'deq/cn10k/deq_16_31_tmo_seg_burst.c',
         'deq/cn10k/deq_32_47_tmo_seg_burst.c',