diff --git a/arch/arm64/include/asm/kvm_s2mpu.h b/arch/arm64/include/asm/kvm_s2mpu.h
index fa10bc754f03..6b9218673031 100644
--- a/arch/arm64/include/asm/kvm_s2mpu.h
+++ b/arch/arm64/include/asm/kvm_s2mpu.h
@@ -268,7 +268,7 @@ static inline bool __is_smpt_uniform(u32 *smpt, enum mpt_prot prot)
 	return true;
 }
 
-/**
+/*
  * Set protection bits of FMPT/SMPT in a given range.
  * Returns flags specifying whether L1/L2 changes need to be made visible
  * to the device.
diff --git a/arch/arm64/kvm/hyp/nvhe/iommu/s2mpu.c b/arch/arm64/kvm/hyp/nvhe/iommu/s2mpu.c
index fb9ce31a7ae0..89b2f0763780 100644
--- a/arch/arm64/kvm/hyp/nvhe/iommu/s2mpu.c
+++ b/arch/arm64/kvm/hyp/nvhe/iommu/s2mpu.c
@@ -157,7 +157,7 @@ static void __set_l1entry_l2table_addr(struct s2mpu *dev, unsigned int gb,
 	       dev->va + REG_NS_L1ENTRY_L2TABLE_ADDR(vid, gb));
 }
 
-/**
+/*
  * Initialize S2MPU device and set all GB regions to 1G granularity with
  * given protection bits.
  */
@@ -176,7 +176,7 @@ static void initialize_with_prot(struct s2mpu *dev, enum mpt_prot prot)
 	__set_control_regs(dev);
 }
 
-/**
+/*
  * Initialize S2MPU device, set L2 table addresses and configure L1TABLE_ATTR
  * registers according to the given MPT struct.
  */
@@ -199,7 +199,7 @@ static void initialize_with_mpt(struct s2mpu *dev, struct mpt *mpt)
 	__set_control_regs(dev);
 }
 
-/**
+/*
  * Set MPT protection bits set to 'prot' in the give byte range (page-aligned).
  * Update currently powered S2MPUs.
  */
diff --git a/arch/arm64/kvm/iommu/s2mpu.c b/arch/arm64/kvm/iommu/s2mpu.c
index 12b387b351bc..00111f237de3 100644
--- a/arch/arm64/kvm/iommu/s2mpu.c
+++ b/arch/arm64/kvm/iommu/s2mpu.c
@@ -134,7 +134,7 @@ static int s2mpu_probe_v9(struct platform_device *pdev, void __iomem *kaddr,
 	return 0;
 }
 
-/**
+/*
  * Parse interrupt information from DT and if found, register IRQ handler.
  * This is considered optional and will not fail even if the initialization is
  * unsuccessful. In that case the IRQ will remain masked.