diff --git a/arch/arm/core/fault.c b/arch/arm/core/fault.c
index 6e1b636fa94..a8d1546e0df 100644
--- a/arch/arm/core/fault.c
+++ b/arch/arm/core/fault.c
@@ -367,7 +367,7 @@ static void _FaultDump(const NANO_ESF *esf, int fault)
  * \NOMANUAL
  */
 
-void _Fault( const NANO_ESF *msp, const NANO_ESF *psp)
+void _Fault(const NANO_ESF *msp, const NANO_ESF *psp)
 {
 	const NANO_ESF *esf = _ScbIsNestedExc() ? msp : psp;
 	int fault = _ScbActiveVectorGet();
diff --git a/arch/arm/core/sys_fatal_error_handler.c b/arch/arm/core/sys_fatal_error_handler.c
index fb2d1080283..f0964dbfd87 100644
--- a/arch/arm/core/sys_fatal_error_handler.c
+++ b/arch/arm/core/sys_fatal_error_handler.c
@@ -70,7 +70,7 @@ static inline void nonEssentialTaskAbort(void)
  * \NOMANUAL
  */
 
-void _SysFatalErrorHandler( unsigned int reason, const NANO_ESF * pEsf)
+void _SysFatalErrorHandler(unsigned int reason, const NANO_ESF * pEsf)
 {
 	nano_context_type_t curCtx = sys_execution_context_type_get();
 
diff --git a/arch/x86/core/intconnect.c b/arch/x86/core/intconnect.c
index 26049cc185b..24eadb306b4 100644
--- a/arch/x86/core/intconnect.c
+++ b/arch/x86/core/intconnect.c
@@ -185,7 +185,7 @@ static int _int_stub_alloc(void)
  *
  */
 
-void _IntVecSet( unsigned int vector, void (*routine)(void *), unsigned int dpl)
+void _IntVecSet(unsigned int vector, void (*routine)(void *), unsigned int dpl)
 {
 	unsigned long long *pIdtEntry;
 	unsigned int key;
@@ -271,7 +271,7 @@ void _IntVecSet( unsigned int vector, void (*routine)(void *), unsigned int dpl)
  * vectors remaining in the specified <priority> level.
  */
 
-int irq_connect( unsigned int irq, unsigned int priority,
+int irq_connect(unsigned int irq, unsigned int priority,
 	void (*routine)(void *parameter), void *parameter)
 {
 	unsigned char offsetAdjust;
diff --git a/arch/x86/core/strtask.c b/arch/x86/core/strtask.c
index 396a76db3a3..76a13914b4f 100644
--- a/arch/x86/core/strtask.c
+++ b/arch/x86/core/strtask.c
@@ -46,7 +46,7 @@
  * @return N/A
  */
 
-void _StartTaskArch( struct k_task *X, unsigned int *pOpt)
+void _StartTaskArch(struct k_task *X, unsigned int *pOpt)
 {
 	/*
 	 * The IA-32 nanokernel implementation uses the USE_FP bit in the
diff --git a/arch/x86/include/nano_private.h b/arch/x86/include/nano_private.h
index 4a0fe766746..906f14e9124 100644
--- a/arch/x86/include/nano_private.h
+++ b/arch/x86/include/nano_private.h
@@ -815,7 +815,7 @@ static inline void nanoArchInit(void)
  * \NOMANUAL
  */
 
-static inline void fiberRtnValueSet( struct tcs *fiber, unsigned int value)
+static inline void fiberRtnValueSet(struct tcs *fiber, unsigned int value)
 {
 	/* write into 'eax' slot created in _Swap() entry */
 
diff --git a/include/arch/x86/arch.h b/include/arch/x86/arch.h
index 79ce73066be..26ff1b0dc8e 100644
--- a/include/arch/x86/arch.h
+++ b/include/arch/x86/arch.h
@@ -419,10 +419,10 @@ extern void	nano_cpu_idle(void);
 
 /** Nanokernel provided routine to report any detected fatal error. */
 extern FUNC_NORETURN void _NanoFatalErrorHandler(unsigned int reason,
-						 const NANO_ESF *pEsf);
+						 const NANO_ESF * pEsf);
 /** User provided routine to handle any detected fatal error post reporting. */
 extern FUNC_NORETURN void _SysFatalErrorHandler(unsigned int reason,
-						const NANO_ESF *pEsf);
+						const NANO_ESF * pEsf);
 /** Dummy ESF for fatal errors that would otherwise not have an ESF */
 extern const NANO_ESF _default_esf;
 
diff --git a/include/arch/x86/linker-common-sections.h b/include/arch/x86/linker-common-sections.h
index 049ad0dda53..aadadb33aea 100644
--- a/include/arch/x86/linker-common-sections.h
+++ b/include/arch/x86/linker-common-sections.h
@@ -117,7 +117,7 @@ SECTIONS
 	GROUP_START(RAM)
 
 #if defined(CONFIG_XIP)
-	SECTION_AT_PROLOGUE(_DATA_SECTION_NAME, (OPTIONAL),,__data_rom_start)
+	SECTION_AT_PROLOGUE(_DATA_SECTION_NAME, (OPTIONAL), , __data_rom_start)
 #else
 	SECTION_PROLOGUE(_DATA_SECTION_NAME, (OPTIONAL),)
 #endif