diff --git a/hif/inc/hif.h b/hif/inc/hif.h
index 956e6429d414..a61470f0d987 100644
--- a/hif/inc/hif.h
+++ b/hif/inc/hif.h
@@ -311,9 +311,11 @@ typedef void (*fastpath_msg_handler)(void *, qdf_nbuf_t *, uint32_t);
 void hif_enable_fastpath(struct hif_opaque_softc *hif_ctx);
 bool hif_is_fastpath_mode_enabled(struct hif_opaque_softc *hif_ctx);
 void *hif_get_ce_handle(struct hif_opaque_softc *hif_ctx, int);
-int hif_ce_fastpath_cb_register(fastpath_msg_handler handler, void *context);
+int hif_ce_fastpath_cb_register(struct hif_opaque_softc *hif_ctx,
+				fastpath_msg_handler handler, void *context);
 #else
-static inline int hif_ce_fastpath_cb_register(fastpath_msg_handler handler,
+static inline int hif_ce_fastpath_cb_register(struct hif_opaque_softc *hif_ctx,
+					      fastpath_msg_handler handler,
 					      void *context)
 {
 	return QDF_STATUS_E_FAILURE;
diff --git a/hif/src/ce/ce_main.c b/hif/src/ce/ce_main.c
index a187d5b02fb3..18580eda3ead 100644
--- a/hif/src/ce/ce_main.c
+++ b/hif/src/ce/ce_main.c
@@ -48,7 +48,6 @@
 #include "ce_tasklet.h"
 #include "platform_icnss.h"
 #include "qwlan_version.h"
-#include <cds_api.h>
 
 #define CE_POLL_TIMEOUT 10      /* ms */
 
@@ -1960,11 +1959,12 @@ err:
  *
  * Return: QDF_STATUS_SUCCESS on success or QDF_STATUS_E_FAILURE
  */
-int hif_ce_fastpath_cb_register(fastpath_msg_handler handler, void *context)
+int hif_ce_fastpath_cb_register(struct hif_opaque_softc *hif_ctx,
+				fastpath_msg_handler handler,
+				void *context)
 {
-	struct hif_softc *scn =
-	    (struct hif_softc *)cds_get_context(QDF_MODULE_ID_HIF);
 	struct CE_state *ce_state;
+	struct hif_softc *scn = HIF_GET_SOFTC(hif_ctx);
 	int i;
 
 	QDF_ASSERT(scn != NULL);