]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
staging: vchiq_core: Use return value of mutex_lock_killable directly
authorStefan Wahren <stefan.wahren@i2se.com>
Thu, 25 May 2017 22:26:11 +0000 (00:26 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 29 May 2017 15:02:29 +0000 (17:02 +0200)
Instead of saving the return value of mutex_lock_killable in a
local variable we could use the value directly.

Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c

index 4f9e738abddff744638308ffa7235e782c909941..6b24651e9eea244d5ee135782bfef23d5efe65b5 100644 (file)
@@ -1376,7 +1376,6 @@ resolve_bulks(VCHIQ_SERVICE_T *service, VCHIQ_BULK_QUEUE_T *queue)
 {
        VCHIQ_STATE_T *state = service->state;
        int resolved = 0;
-       int rc;
 
        while ((queue->process != queue->local_insert) &&
                (queue->process != queue->remote_insert)) {
@@ -1392,8 +1391,7 @@ resolve_bulks(VCHIQ_SERVICE_T *service, VCHIQ_BULK_QUEUE_T *queue)
                WARN_ON(!((int)(queue->local_insert - queue->process) > 0));
                WARN_ON(!((int)(queue->remote_insert - queue->process) > 0));
 
-               rc = mutex_lock_killable(&state->bulk_transfer_mutex);
-               if (rc != 0)
+               if (mutex_lock_killable(&state->bulk_transfer_mutex))
                        break;
 
                vchiq_transfer_bulk(bulk);