diff --git a/docs/getting_started/building-with-shrinkwrap.rst b/docs/getting_started/building-with-shrinkwrap.rst
index 7018e0c..50d54b2 100644
--- a/docs/getting_started/building-with-shrinkwrap.rst
+++ b/docs/getting_started/building-with-shrinkwrap.rst
@@ -37,7 +37,7 @@
 ``${PWD}``) is the root of your |RMM| development repository.
 
 In order to use the configs defined in |RMM|, it is essential to configure
-the ``${SHRINKWRAP_CONFIG}`` environment variable to point to 
+the ``${SHRINKWRAP_CONFIG}`` environment variable to point to
 ``${PWD}/tools/shrinkwrap/configs`` directory so the tool can locate the
 config yaml files.
 
diff --git a/lib/attestation/src/attestation_rnd.c b/lib/attestation/src/attestation_rnd.c
index 99090d1..9d79466 100644
--- a/lib/attestation/src/attestation_rnd.c
+++ b/lib/attestation/src/attestation_rnd.c
@@ -38,7 +38,6 @@
 		len -= sizeof(uint64_t);
 		output += sizeof(uint64_t);
 	}
-	return;
 }
 
 /*
diff --git a/lib/attestation/src/attestation_utils.c b/lib/attestation/src/attestation_utils.c
index 72a8d56..aab0553 100644
--- a/lib/attestation/src/attestation_utils.c
+++ b/lib/attestation/src/attestation_utils.c
@@ -112,7 +112,7 @@
 	/* Disable Data Independent Timing feature */
 	write_dit(0x0);
 
-attest_init_fail :
+attest_init_fail:
 	buffer_alloc_ctx_unassign();
 	return ret;
 }
diff --git a/lib/smc/include/smc.h b/lib/smc/include/smc.h
index bb98f70..d59e579 100644
--- a/lib/smc/include/smc.h
+++ b/lib/smc/include/smc.h
@@ -33,7 +33,7 @@
 /*
  * SVE Hint bit (SMCCCv1.3), denoting the absence of SVE specific live state.
  *
- * MISRA treats 1U as as 8-bit type variables. So use 1UL and typecast the value
+ * MISRA treats 1U as 8-bit type variables. So use 1UL and typecast the value
  * to 'unsigned int'
  */
 #define SMC_SVE_HINT		(U(1) << 16)
diff --git a/plat/host/CMakeLists.txt b/plat/host/CMakeLists.txt
index d7093e4..23c47e4 100644
--- a/plat/host/CMakeLists.txt
+++ b/plat/host/CMakeLists.txt
@@ -20,7 +20,7 @@
 
 add_subdirectory("../common" ${RMM_BINARY_DIR}/plat/common)
 
-# Add the the HOST_VARIANT directory before common, so that it has the option
+# Add the HOST_VARIANT directory before common, so that it has the option
 # to override HOST_MEM_SIZE
 add_subdirectory("${HOST_VARIANT}")
 add_subdirectory("common")