diff --git a/arch/arm64/kernel/virtcca_cvm_tsi.c b/arch/arm64/kernel/virtcca_cvm_tsi.c
index be2b32009a677c441c73ae59a0bf6ffc9705eaeb..dc3238d5fff74acf3ea883925ab8d7977e86bc5e 100644
--- a/arch/arm64/kernel/virtcca_cvm_tsi.c
+++ b/arch/arm64/kernel/virtcca_cvm_tsi.c
@@ -36,7 +36,6 @@ static struct miscdevice ioctl_dev = {
 
 static int __init tmm_tsi_init(void)
 {
-	unsigned long ver;
 	int ret;
 
 	if (!is_virtcca_cvm_world())
@@ -53,10 +52,6 @@ static int __init tmm_tsi_init(void)
 	if (!token.buf)
 		return -ENOMEM;
 
-	pr_warn("tmm_tsi: module loaded (version %lu.%lu).\n",
-			TSI_ABI_VERSION_GET_MAJOR(ver),
-			TSI_ABI_VERSION_GET_MINOR(ver));
-
 	return 0;
 }
 
diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c
index fe3add87ef529e3712de9ea473be495945449d41..be89809052793a341261d39dcfe9aac7fcacaafd 100644
--- a/arch/arm64/kvm/arm.c
+++ b/arch/arm64/kvm/arm.c
@@ -136,6 +136,7 @@ int kvm_vm_ioctl_enable_cap(struct kvm *kvm,
 		break;
 #ifdef CONFIG_HISI_VIRTCCA_HOST
 	case KVM_CAP_ARM_TMM:
+		r = 0;
 		if (static_branch_unlikely(&virtcca_cvm_is_available))
 			r = kvm_cvm_enable_cap(kvm, cap);
 		break;
diff --git a/arch/arm64/kvm/tmi.c b/arch/arm64/kvm/tmi.c
index c1f22139d7865eb4a9cedd35a7143f5564543ff9..888f1a4a248e2f561033efd4e34776de9cf50333 100644
--- a/arch/arm64/kvm/tmi.c
+++ b/arch/arm64/kvm/tmi.c
@@ -127,15 +127,3 @@ u64 tmi_ttt_unmap_range(u64 rd, u64 map_addr, u64 size, u64 node_id)
 	arm_smccc_1_1_smc(TMI_TMM_TTT_UNMAP_RANGE, rd, map_addr, size, node_id, &res);
 	return res.a1;
 }
-
-u64 tmi_tmm_inf_test(u64 x1, u64 x2, u64 x3, u64 x4, u64 x5)
-{
-	struct arm_smccc_res res;
-	u64 vttbr_el2_pa = __pa(x2);
-	u64 cvm_params_pa = __pa(x3);
-	u64 tec_params_pa = __pa(x4);
-
-	arm_smccc_1_1_smc(TMI_TMM_INF_TEST, x1, vttbr_el2_pa, cvm_params_pa, tec_params_pa, x5, &res);
-	return res.a1;
-}
-EXPORT_SYMBOL_GPL(tmi_tmm_inf_test);
\ No newline at end of file
diff --git a/arch/arm64/kvm/virtcca_cvm.c b/arch/arm64/kvm/virtcca_cvm.c
index 367bbf4fa3e68ddf34cdd830be186050de2528fd..e8fd28fb9ecb7fa877a83102cd926ecaa58ec0e3 100644
--- a/arch/arm64/kvm/virtcca_cvm.c
+++ b/arch/arm64/kvm/virtcca_cvm.c
@@ -67,31 +67,16 @@ static bool tmm_supports(unsigned long feature)
 	return !!u64_get_bits(tmm_feat_reg0, feature);
 }
 
-bool kvm_cvm_supports_sve(void)
+static bool kvm_cvm_supports_sve(void)
 {
 	return tmm_supports(TMI_FEATURE_REGISTER_0_SVE_EN);
 }
 
-bool kvm_cvm_supports_pmu(void)
+static bool kvm_cvm_supports_pmu(void)
 {
 	return tmm_supports(TMI_FEATURE_REGISTER_0_PMU_EN);
 }
 
-u32 kvm_cvm_ipa_limit(void)
-{
-	return u64_get_bits(tmm_feat_reg0, TMI_FEATURE_REGISTER_0_S2SZ);
-}
-
-u32 kvm_cvm_get_num_brps(void)
-{
-	return u64_get_bits(tmm_feat_reg0, TMI_FEATURE_REGISTER_0_NUM_BPS);
-}
-
-u32 kvm_cvm_get_num_wrps(void)
-{
-	return u64_get_bits(tmm_feat_reg0, TMI_FEATURE_REGISTER_0_NUM_WPS);
-}
-
 static int cvm_vmid_reserve(void)
 {
 	int ret;
@@ -241,7 +226,7 @@ static int kvm_cvm_ttt_create(struct virtcca_cvm *cvm,
 	return tmi_ttt_create(numa_set, cvm->rd, addr, level);
 }
 
-int kvm_cvm_create_ttt_levels(struct kvm *kvm, struct virtcca_cvm *cvm,
+static int kvm_cvm_create_ttt_levels(struct kvm *kvm, struct virtcca_cvm *cvm,
 			unsigned long ipa,
 			int level,
 			int max_level,
@@ -308,7 +293,7 @@ static bool is_data_create_region(phys_addr_t ipa_base,
 	return false;
 }
 
-int kvm_cvm_populate_par_region(struct kvm *kvm, u64 numa_set,
+static int kvm_cvm_populate_par_region(struct kvm *kvm, u64 numa_set,
 			phys_addr_t ipa_base, phys_addr_t ipa_end,
 			struct kvm_cap_arm_tmm_populate_region_args *args)
 {