diff --git a/hypervisor/include/arch/x86/guest/vm.h b/hypervisor/include/arch/x86/guest/vm.h
index 2f885dc6a..fc5884f85 100644
--- a/hypervisor/include/arch/x86/guest/vm.h
+++ b/hypervisor/include/arch/x86/guest/vm.h
@@ -216,29 +216,31 @@ static inline struct acrn_vcpu *vcpu_from_vid(struct acrn_vm *vm, uint16_t vcpu_
 static inline struct acrn_vcpu *vcpu_from_pid(struct acrn_vm *vm, uint16_t pcpu_id)
 {
 	uint16_t i;
-	struct acrn_vcpu *vcpu;
+	struct acrn_vcpu *vcpu, *target_vcpu = NULL;
 
 	foreach_vcpu(i, vm, vcpu) {
 		if (vcpu->pcpu_id == pcpu_id) {
-			return vcpu;
+			target_vcpu = vcpu;
+			break;
 		}
 	}
 
-	return NULL;
+	return target_vcpu;
 }
 
 static inline struct acrn_vcpu *get_primary_vcpu(struct acrn_vm *vm)
 {
 	uint16_t i;
-	struct acrn_vcpu *vcpu;
+	struct acrn_vcpu *vcpu, *target_vcpu = NULL;
 
 	foreach_vcpu(i, vm, vcpu) {
 		if (is_vcpu_bsp(vcpu)) {
-			return vcpu;
+			target_vcpu = vcpu;
+			break;
 		}
 	}
 
-	return NULL;
+	return target_vcpu;
 }
 
 static inline struct acrn_vuart*
diff --git a/hypervisor/include/lib/bits.h b/hypervisor/include/lib/bits.h
index a73cc7140..bbb7b0fae 100644
--- a/hypervisor/include/lib/bits.h
+++ b/hypervisor/include/lib/bits.h
@@ -133,15 +133,17 @@ static inline uint16_t ffz64(uint64_t value)
  */
 static inline uint64_t ffz64_ex(const uint64_t *addr, uint64_t size)
 {
+	uint64_t ret = size;
 	uint64_t idx;
 
 	for (idx = 0UL; (idx << 6U) < size; idx++) {
 		if (addr[idx] != ~0UL) {
-			return (idx << 6U) + ffz64(addr[idx]);
+			ret = (idx << 6U) + ffz64(addr[idx]);
+			break;
 		}
 	}
 
-	return size;
+	return ret;
 }
 /*
  * Counts leading zeros.
@@ -160,11 +162,7 @@ static inline uint64_t ffz64_ex(const uint64_t *addr, uint64_t size)
  */
 static inline uint16_t clz(uint32_t value)
 {
-	if (value == 0U) {
-		return 32U;
-	} else {
-		return (31U - fls32(value));
-	}
+	return ((value != 0U) ? (31U - fls32(value)) : 32U);
 }
 
 /*
@@ -176,11 +174,7 @@ static inline uint16_t clz(uint32_t value)
  */
 static inline uint16_t clz64(uint64_t value)
 {
-	if (value == 0UL) {
-		return 64U;
-	} else {
-		return (63U - fls64(value));
-	}
+	return ((value != 0UL) ? (63U - fls64(value)) : 64U);
 }
 
 /*