diff --git a/targets/ARCH/COMMON/common_lib.c b/targets/ARCH/COMMON/common_lib.c
index a9d6daa9543d1b5c3c633d7cf4beff6695184327..6d98aeed26ee44fd14eba6a50c9e4102c35f84fa 100644
--- a/targets/ARCH/COMMON/common_lib.c
+++ b/targets/ARCH/COMMON/common_lib.c
@@ -55,26 +55,21 @@ int set_device(openair0_device *device) {
     
   case EXMIMO_DEV:
     printf("[%s] has loaded EXPRESS MIMO device.\n",((device->host_type == BBU_HOST) ? "BBU": "RRH"));
-    return 0;     
     break;
   case USRP_DEV:
     printf("[%s] has loaded USRP device.\n",((device->host_type == BBU_HOST) ? "BBU": "RRH")); 
-    return 0;
     break;
   case BLADERF_DEV:
     printf("[%s] has loaded BLADERF device.\n",((device->host_type == BBU_HOST) ? "BBU": "RRH")); 
-    return 0;
     break;
   case NONE_DEV:
     printf("[%s] has not loaded a HW device.\n",((device->host_type == BBU_HOST) ? "BBU": "RRH"));
-    return 0; 
     break;    
   default:
     printf("[%s] invalid HW device.\n",((device->host_type == BBU_HOST) ? "BBU": "RRH")); 
     return -1;
-    break;
   }
-  
+  return 0;
 }
 
 int set_transport(openair0_device *device) {