staging: vchiq_core: Simplify vchiq_send_remote_use*
authorStefan Wahren <stefan.wahren@i2se.com>
Sun, 11 Apr 2021 18:11:31 +0000 (20:11 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 12 Apr 2021 09:41:21 +0000 (11:41 +0200)
There is no need for variable status. So drop it and improve readability.

Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
Link: https://lore.kernel.org/r/1618164700-21150-2-git-send-email-stefan.wahren@i2se.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c

index 0b0a97b..271d498 100644 (file)
@@ -3702,24 +3702,22 @@ vchiq_loud_error_footer(void)
 
 enum vchiq_status vchiq_send_remote_use(struct vchiq_state *state)
 {
-       enum vchiq_status status = VCHIQ_RETRY;
+       if (state->conn_state == VCHIQ_CONNSTATE_DISCONNECTED)
+               return VCHIQ_RETRY;
 
-       if (state->conn_state != VCHIQ_CONNSTATE_DISCONNECTED)
-               status = queue_message(state, NULL,
-                       VCHIQ_MAKE_MSG(VCHIQ_MSG_REMOTE_USE, 0, 0),
-                       NULL, NULL, 0, 0);
-       return status;
+       return queue_message(state, NULL,
+                            VCHIQ_MAKE_MSG(VCHIQ_MSG_REMOTE_USE, 0, 0),
+                            NULL, NULL, 0, 0);
 }
 
 enum vchiq_status vchiq_send_remote_use_active(struct vchiq_state *state)
 {
-       enum vchiq_status status = VCHIQ_RETRY;
+       if (state->conn_state == VCHIQ_CONNSTATE_DISCONNECTED)
+               return VCHIQ_RETRY;
 
-       if (state->conn_state != VCHIQ_CONNSTATE_DISCONNECTED)
-               status = queue_message(state, NULL,
-                       VCHIQ_MAKE_MSG(VCHIQ_MSG_REMOTE_USE_ACTIVE, 0, 0),
-                       NULL, NULL, 0, 0);
-       return status;
+       return queue_message(state, NULL,
+                            VCHIQ_MAKE_MSG(VCHIQ_MSG_REMOTE_USE_ACTIVE, 0, 0),
+                            NULL, NULL, 0, 0);
 }
 
 void vchiq_log_dump_mem(const char *label, u32 addr, const void *void_mem,