diff --git a/hif/src/ce/ce_tasklet.c b/hif/src/ce/ce_tasklet.c
index b5983e37ad..a83bcd1344 100644
--- a/hif/src/ce/ce_tasklet.c
+++ b/hif/src/ce/ce_tasklet.c
@@ -698,7 +698,7 @@ QDF_STATUS ce_unregister_irq(struct HIF_CE_state *hif_ce_state, uint32_t mask)
 	struct hif_softc *scn;
 
 	if (!hif_ce_state) {
-		HIF_WARN("%s: hif_ce_state = NULL", __func__);
+		hif_warn("hif_ce_state = NULL");
 		return QDF_STATUS_SUCCESS;
 	}
 
diff --git a/hif/src/hif_exec.c b/hif/src/hif_exec.c
index 70f1462648..97272ba957 100644
--- a/hif/src/hif_exec.c
+++ b/hif/src/hif_exec.c
@@ -709,7 +709,7 @@ static struct hif_exec_context *hif_exec_napi_create(uint32_t scale)
 #else
 static struct hif_exec_context *hif_exec_napi_create(uint32_t scale)
 {
-	HIF_WARN("%s: FEATURE_NAPI not defined, making tasklet", __func__);
+	hif_warn("FEATURE_NAPI not defined, making tasklet");
 	return hif_exec_tasklet_create();
 }
 #endif
diff --git a/hif/src/hif_main_legacy.c b/hif/src/hif_main_legacy.c
index 1c4e8a4935..8f913b3f29 100644
--- a/hif/src/hif_main_legacy.c
+++ b/hif/src/hif_main_legacy.c
@@ -71,7 +71,7 @@ QDF_STATUS hif_ce_fastpath_cb_register(struct hif_opaque_softc *hif_ctx,
 	}
 
 	if (!scn->fastpath_mode_on) {
-		HIF_WARN("%s: Fastpath mode disabled", __func__);
+		hif_warn("Fastpath mode disabled");
 		return QDF_STATUS_E_FAILURE;
 	}
 
diff --git a/hif/src/hif_napi.c b/hif/src/hif_napi.c
index d15de4522e..f6cf6cb6e2 100644
--- a/hif/src/hif_napi.c
+++ b/hif/src/hif_napi.c
@@ -199,8 +199,7 @@ int hif_napi_create(struct hif_opaque_softc   *hif_ctx,
 		napii->irq   = pld_get_irq(hif->qdf_dev->dev, i);
 
 		if (napii->irq < 0)
-			HIF_WARN("%s: bad IRQ value for CE %d: %d",
-				 __func__, i, napii->irq);
+			hif_warn("bad IRQ value for CE %d: %d", i, napii->irq);
 
 		init_dummy_netdev(&(napii->netdev));
 
@@ -233,7 +232,7 @@ int hif_napi_create(struct hif_opaque_softc   *hif_ctx,
 
 	/* no ces registered with the napi */
 	if (!ce_srng_based(hif) && napid->ce_map == 0) {
-		HIF_WARN("%s: no napis created for copy engines", __func__);
+		hif_warn("no napis created for copy engines");
 		rc = -EFAULT;
 		goto napii_free;
 	}
diff --git a/hif/src/sdio/native_sdio/src/hif.c b/hif/src/sdio/native_sdio/src/hif.c
index e3bf312888..eea5935bb1 100644
--- a/hif/src/sdio/native_sdio/src/hif.c
+++ b/hif/src/sdio/native_sdio/src/hif.c
@@ -465,7 +465,7 @@ hif_configure_device(struct hif_softc *ol_sc, struct hif_sdio_dev *device,
 		break;
 
 	case HIF_DEVICE_GET_PENDING_EVENTS_FUNC:
-		HIF_WARN("%s: opcode %d",  __func__, opcode);
+		hif_warn("opcode %d", opcode);
 		status = QDF_STATUS_E_FAILURE;
 		break;
 	case HIF_DEVICE_GET_IRQ_PROC_MODE:
@@ -473,7 +473,7 @@ hif_configure_device(struct hif_softc *ol_sc, struct hif_sdio_dev *device,
 			HIF_DEVICE_IRQ_SYNC_ONLY;
 		break;
 	case HIF_DEVICE_GET_RECV_EVENT_MASK_UNMASK_FUNC:
-		HIF_WARN("%s: opcode %d", __func__, opcode);
+		hif_warn("opcode %d", opcode);
 		status = QDF_STATUS_E_FAILURE;
 		break;
 	case HIF_CONFIGURE_QUERY_SCATTER_REQUEST_SUPPORT:
@@ -498,7 +498,7 @@ hif_configure_device(struct hif_softc *ol_sc, struct hif_sdio_dev *device,
 					   config);
 		break;
 	case HIF_DEVICE_GET_IRQ_YIELD_PARAMS:
-		HIF_WARN("%s: opcode %d", __func__, opcode);
+		hif_warn("opcode %d", opcode);
 		status = QDF_STATUS_E_FAILURE;
 		break;
 	case HIF_DEVICE_SET_HTC_CONTEXT:
diff --git a/hif/src/snoc/if_snoc.c b/hif/src/snoc/if_snoc.c
index 68d6c33b9c..2ca81eb3c0 100644
--- a/hif/src/snoc/if_snoc.c
+++ b/hif/src/snoc/if_snoc.c
@@ -279,8 +279,7 @@ QDF_STATUS hif_snoc_enable_bus(struct hif_softc *ol_sc,
 
 	ret = qdf_device_init_wakeup(ol_sc->qdf_dev, true);
 	if (ret == -EEXIST)
-		HIF_WARN("%s: device_init_wakeup already done",
-				__func__);
+		hif_warn("device_init_wakeup already done");
 	else if (ret) {
 		hif_err("device_init_wakeup: err= %d", ret);
 		return qdf_status_from_os_return(ret);
diff --git a/hif/src/usb/usbdrv.c b/hif/src/usb/usbdrv.c
index 788ad1b389..72481c02c4 100644
--- a/hif/src/usb/usbdrv.c
+++ b/hif/src/usb/usbdrv.c
@@ -464,7 +464,7 @@ static void usb_hif_flush_pending_transfers(struct HIF_USB_PIPE *pipe)
 	while (1) {
 		urb_context = usb_hif_dequeue_pending_transfer(pipe);
 		if (!urb_context) {
-			HIF_WARN("urb_context is NULL");
+			hif_warn("urb_context is NULL");
 			break;
 		}
 		HIF_TRACE("  pending urb ctxt: 0x%pK", urb_context);