Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ACPI: Avoid discarding a potential error value.

Browse Source 
This is part of a new diagnostic I've managed to wire up
that finds all instances of "status_t" function return
values being discarded using attribute trickery and some
creative Clang pragmas. As you might guess, the resultant
errors list is absolutely gigantic, and most of them are
ones where the failure condition will never (that we care
about) be hit.

The ones in this commit likely are no-op changes, but
they were low-hanging fruit spotted while reviewing
the larger list. The next commit will bring more
substantial changes.
This commit is contained in:
Augustin Cavalier 2019-08-02 19:13:14 -04:00
parent 2846db2e99
commit a4a538db9f
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/add-ons/kernel/bus_managers/acpi/ACPICAHaiku.cpp
View File

@ -772,10 +772,9 @@ AcpiOsRemoveInterruptHandler(UINT32 interruptNumber,
DEBUG_FUNCTION_F("vector: %lu; handler: %p", (uint32)interruptNumber,
serviceRoutine);
#ifdef _KERNEL_MODE
remove_io_interrupt_handler(interruptNumber,
(interrupt_handler) serviceRoutine,
sInterruptHandlerData[interruptNumber]);
return AE_OK;
return remove_io_interrupt_handler(interruptNumber,
(interrupt_handler)serviceRoutine,
sInterruptHandlerData[interruptNumber]) == B_OK ? AE_OK : AE_ERROR;
#else
return AE_ERROR;
#endif

6
src/add-ons/kernel/bus_managers/acpi/EmbeddedController.h
View File

@ -188,15 +188,13 @@ static status_t
EcLock(struct acpi_ec_cookie *sc)
{
/* If _GLK is non-zero, acquire the global lock. */
status_t status = B_OK;
if (sc->ec_glk) {
status = sc->ec_acpi_module->acquire_global_lock(EC_LOCK_TIMEOUT,
status_t status = sc->ec_acpi_module->acquire_global_lock(EC_LOCK_TIMEOUT,
&sc->ec_glkhandle);
if (status != B_OK)
return status;
}
mutex_lock(&sc->ec_lock);
return status;
return mutex_lock(&sc->ec_lock);
}