--- a/nss_n2h.c
+++ b/nss_n2h.c
@@ -1269,11 +1269,11 @@ static int nss_n2h_mitigationcfg_core0_h
 	}
 
 	if (!nss_n2h_core0_mitigation_cfg) {
-		printk(KERN_INFO "Disabling NSS MITIGATION\n");
+		dev_info(nss_ctx->dev, "Disabling NSS MITIGATION\n");
 		nss_n2h_mitigation_cfg(nss_ctx, 0, NSS_CORE_0);
 		return 0;
 	}
-	printk(KERN_INFO "Invalid input value.Valid value is 0, Runtime re-enabling not supported\n");
+	dev_info(nss_ctx->dev, "Invalid input value.Valid value is 0, Runtime re-enabling not supported\n");
 	return -EINVAL;
 }
 
@@ -1300,11 +1300,11 @@ static int nss_n2h_mitigationcfg_core1_h
 	}
 
 	if (!nss_n2h_core1_mitigation_cfg) {
-		printk(KERN_INFO "Disabling NSS MITIGATION\n");
+		dev_info(nss_ctx->dev, "Disabling NSS MITIGATION\n");
 		nss_n2h_mitigation_cfg(nss_ctx, 0, NSS_CORE_1);
 		return 0;
 	}
-	printk(KERN_INFO "Invalid input value.Valid value is 0, Runtime re-enabling not supported\n");
+	dev_info(nss_ctx->dev, "Invalid input value.Valid value is 0, Runtime re-enabling not supported\n");
 	return -EINVAL;
 }
 
@@ -1336,14 +1336,14 @@ static int nss_n2h_buf_cfg_core0_handler
 	}
 
 	if ((nss_n2h_core0_add_buf_pool_size >= 1) && (nss_n2h_core0_add_buf_pool_size <= NSS_N2H_MAX_BUF_POOL_SIZE)) {
-		printk(KERN_INFO "configuring additional NSS pbufs\n");
+		dev_info(nss_ctx->dev, "Configuring additional NSS pbufs\n");
 		ret = nss_n2h_buf_pool_cfg(nss_ctx, nss_n2h_core0_add_buf_pool_size, NSS_CORE_0);
 		nss_n2h_core0_add_buf_pool_size = nss_ctx->buf_sz_allocated;
-		printk(KERN_INFO "additional pbufs of size %d got added to NSS\n", nss_ctx->buf_sz_allocated);
+		dev_info(nss_ctx->dev, "Additional pbufs of size %d got added to NSS\n", nss_ctx->buf_sz_allocated);
 		return ret;
 	}
 
-	printk(KERN_INFO "Invalid input value. should be greater than 1 and less than %d\n", NSS_N2H_MAX_BUF_POOL_SIZE);
+	dev_info(nss_ctx->dev, "Invalid input value. should be greater than 1 and less than %d\n", NSS_N2H_MAX_BUF_POOL_SIZE);
 	return -EINVAL;
 }
 
@@ -1375,14 +1375,14 @@ static int nss_n2h_buf_cfg_core1_handler
 	}
 
 	if ((nss_n2h_core1_add_buf_pool_size >= 1) && (nss_n2h_core1_add_buf_pool_size <= NSS_N2H_MAX_BUF_POOL_SIZE)) {
-		printk(KERN_INFO "configuring additional NSS pbufs\n");
+		dev_info(nss_ctx->dev, "Configuring additional NSS pbufs\n");
 		ret = nss_n2h_buf_pool_cfg(nss_ctx, nss_n2h_core1_add_buf_pool_size, NSS_CORE_1);
 		nss_n2h_core1_add_buf_pool_size = nss_ctx->buf_sz_allocated;
-		printk(KERN_INFO "additional pbufs of size %d got added to NSS\n", nss_ctx->buf_sz_allocated);
+		dev_info(nss_ctx->dev, "Additional pbufs of size %d got added to NSS\n", nss_ctx->buf_sz_allocated);
 		return ret;
 	}
 
-	printk(KERN_INFO "Invalid input value. should be greater than 1 and less than %d\n", NSS_N2H_MAX_BUF_POOL_SIZE);
+	dev_info(nss_ctx->dev, "Invalid input value. should be greater than 1 and less than %d\n", NSS_N2H_MAX_BUF_POOL_SIZE);
 	return -EINVAL;
 }
 
--- a/nss_core.c
+++ b/nss_core.c
@@ -2217,7 +2217,7 @@ static void nss_core_handle_cause_nonque
 		nss_core_init_nss(nss_ctx, if_map);
 		nss_send_ddr_info(nss_ctx);
 
-		nss_info_always("%px: nss core %d booted successfully\n", nss_ctx, nss_ctx->id);
+		dev_info(nss_ctx->dev, "NSS core %d booted successfully\n", nss_ctx->id);
 		nss_top = nss_ctx->nss_top;
 
 #ifdef NSS_DRV_C2C_ENABLE
--- a/nss_hal/nss_hal.c
+++ b/nss_hal/nss_hal.c
@@ -81,7 +81,7 @@ int nss_hal_firmware_load(struct nss_ctx
 		return rc;
 	}
 
-	nss_info("nss_driver - fw of size %d  bytes copied to load addr: %x, nss_id : %d\n", (int)nss_fw->size, npd->load_addr, nss_dev->id);
+	dev_info(&nss_dev->dev, "fw of size %d bytes copied to addr: %x, nss_id: %d", (int)nss_fw->size, npd->load_addr, nss_ctx->id);
 	memcpy_toio(load_mem, nss_fw->data, nss_fw->size);
 	release_firmware(nss_fw);
 	iounmap(load_mem);