diff --git a/src/dev/cpu/cpu_allocator.c b/src/dev/cpu/cpu_allocator.c
index 63feb28b26395c4a1ab03513bba5060168a450c4..1c45e9e0716368db4043f4922bcb441af943dfbf 100644
--- a/src/dev/cpu/cpu_allocator.c
+++ b/src/dev/cpu/cpu_allocator.c
@@ -160,10 +160,9 @@ static struct dev_allocator cpu_allocator = {
 #ifdef STANDLONE_MODE
 void register_cpu_allocator(void)
 #else
+REGISTER_DEV_ALLOCATOR(register_cpu_allocator);
 static void register_cpu_allocator(void)
 {
     init_allocator_registry(&cpu_allocator);
 }
-
-REGISTER_DEV_ALLOCATOR(register_cpu_allocator);
 #endif
diff --git a/src/lib/cpu.c b/src/lib/cpu.c
index 8c1858b06528bdb40d9ea94ff92eee3614c151b3..8e59570292c61c36dfa667f92d58ffb5eb8802e4 100644
--- a/src/lib/cpu.c
+++ b/src/lib/cpu.c
@@ -339,7 +339,6 @@ int set_cpu_affine(size_t mask)
         return -1;
 #endif
 
-    return 0;
 #elif __APPLE_IOS__
     // thread affinity not supported on ios
     ( void )mask;
@@ -349,6 +348,8 @@ int set_cpu_affine(size_t mask)
     if (0 != status)
         return -1;
 #endif
+
+    return 0;
 }
 
 size_t get_cluster_mask(int cluster)