diff --git a/rpcs3/Emu/Cell/lv2/sys_mmapper.cpp b/rpcs3/Emu/Cell/lv2/sys_mmapper.cpp index adedb082c5..ee6edb4901 100644 --- a/rpcs3/Emu/Cell/lv2/sys_mmapper.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_mmapper.cpp @@ -486,7 +486,7 @@ error_code sys_mmapper_enable_page_fault_notification(ppu_thread& ppu, u32 start return CELL_OK; } -CellError mmapper_thread_recover_page_fault(u32 id) +error_code mmapper_thread_recover_page_fault(u32 id) { // We can only wake a thread if it is being suspended for a page fault. auto pf_events = fxm::get_always(); @@ -504,5 +504,5 @@ CellError mmapper_thread_recover_page_fault(u32 id) } pf_events->cond.notify_all(); - return CellError(CELL_OK); + return CELL_OK; } diff --git a/rpcs3/Emu/Cell/lv2/sys_mmapper.h b/rpcs3/Emu/Cell/lv2/sys_mmapper.h index a5a73c2cb4..24b46f39a6 100644 --- a/rpcs3/Emu/Cell/lv2/sys_mmapper.h +++ b/rpcs3/Emu/Cell/lv2/sys_mmapper.h @@ -62,7 +62,7 @@ struct page_fault_event_entries // Aux class ppu_thread; -CellError mmapper_thread_recover_page_fault(u32 id); +error_code mmapper_thread_recover_page_fault(u32 id); // SysCalls error_code sys_mmapper_allocate_address(ppu_thread&, u64 size, u64 flags, u64 alignment, vm::ptr alloc_addr); diff --git a/rpcs3/Emu/Cell/lv2/sys_ppu_thread.cpp b/rpcs3/Emu/Cell/lv2/sys_ppu_thread.cpp index 9aa0a9d200..14f2954afd 100644 --- a/rpcs3/Emu/Cell/lv2/sys_ppu_thread.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_ppu_thread.cpp @@ -434,12 +434,7 @@ error_code sys_ppu_thread_recover_page_fault(u32 thread_id) return CELL_ESRCH; } - if (auto res = mmapper_thread_recover_page_fault(thread_id)) - { - return res; - } - - return CELL_OK; + return mmapper_thread_recover_page_fault(thread_id); } error_code sys_ppu_thread_get_page_fault_context(u32 thread_id, vm::ptr ctxt) diff --git a/rpcs3/Emu/Cell/lv2/sys_spu.cpp b/rpcs3/Emu/Cell/lv2/sys_spu.cpp index 0db9b8cf6a..96b2bf4a10 100644 --- a/rpcs3/Emu/Cell/lv2/sys_spu.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_spu.cpp @@ -1355,12 +1355,7 @@ error_code sys_spu_thread_recover_page_fault(ppu_thread& ppu, u32 id) return CELL_ESRCH; } - if (auto res = mmapper_thread_recover_page_fault(id)) - { - return res; - } - - return CELL_OK; + return mmapper_thread_recover_page_fault(id); } error_code sys_raw_spu_recover_page_fault(ppu_thread& ppu, u32 id) @@ -1376,12 +1371,7 @@ error_code sys_raw_spu_recover_page_fault(ppu_thread& ppu, u32 id) return CELL_ESRCH; } - if (auto res = mmapper_thread_recover_page_fault(id)) - { - return res; - } - - return CELL_OK; + return mmapper_thread_recover_page_fault(id); } error_code sys_raw_spu_create(ppu_thread& ppu, vm::ptr id, vm::ptr attr)