hle: kernel: Drop R_UNLESS_NOLOG in favor of expanded if-statement.

2 files changed, 11 insertions, 3 deletions

diff --git a/src/core/hle/kernel/k_address_arbiter.cpp b/src/core/hle/kernel/k_address_arbiter.cpp
index affc04852..f2f497dc4 100644
--- a/src/core/hle/kernel/k_address_arbiter.cpp
+++ b/src/core/hle/kernel/k_address_arbiter.cpp
@@ -120,7 +120,10 @@ ResultCode KAddressArbiter::SignalAndIncrementIfEqual(VAddr addr, s32 value, s32
         s32 user_value{};
         R_UNLESS(UpdateIfEqual(system, std::addressof(user_value), addr, value, value + 1),
                  Svc::ResultInvalidCurrentMemory);
-        R_UNLESS_NOLOG(user_value == value, Svc::ResultInvalidState);
+
+        if (user_value != value) {
+            return Svc::ResultInvalidState;
+        }
 
         auto it = thread_tree.nfind_light({addr, -1});
         while ((it != thread_tree.end()) && (count <= 0 || num_waiters < count) &&
@@ -211,7 +214,10 @@ ResultCode KAddressArbiter::SignalAndModifyByWaitingCountIfEqual(VAddr addr, s32
         }
 
         R_UNLESS(succeeded, Svc::ResultInvalidCurrentMemory);
-        R_UNLESS_NOLOG(user_value == value, Svc::ResultInvalidState);
+
+        if (user_value != value) {
+            return Svc::ResultInvalidState;
+        }
 
         while ((it != thread_tree.end()) && (count <= 0 || num_waiters < count) &&
                (it->GetAddressArbiterKey() == addr)) {
diff --git a/src/core/hle/kernel/k_readable_event.cpp b/src/core/hle/kernel/k_readable_event.cpp
index cd15aa529..d8a42dbaf 100644
--- a/src/core/hle/kernel/k_readable_event.cpp
+++ b/src/core/hle/kernel/k_readable_event.cpp
@@ -46,7 +46,9 @@ ResultCode KReadableEvent::Clear() {
 ResultCode KReadableEvent::Reset() {
     KScopedSchedulerLock lk{kernel};
 
-    R_UNLESS_NOLOG(is_signaled, Svc::ResultInvalidState);
+    if (!is_signaled) {
+        return Svc::ResultInvalidState;
+    }
 
     is_signaled = false;
     return RESULT_SUCCESS;