staging: vchiq_core: avoid ternary operator for set_service_state

There is already a check for service->sync, so use this instead of a
separate ternary operator to update the service state.

Reviewed-by: Nicolas Saenz Julienne <nsaenz@kernel.org>
Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
Link: https://lore.kernel.org/r/1642968143-19281-14-git-send-email-stefan.wahren@i2se.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
index 7e901be93a4e955577aeeb2e2361242d5f9047b1..612724427b08d28dee6d9505687a088f7adb887e 100644 (file)
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
@@ -1521,15 +1521,17 @@ parse_open(struct vchiq_state *state, struct vchiq_header *header)
                        if (queue_message_sync(state, NULL, openack_id, memcpy_copy_callback,
                                               &ack_payload, sizeof(ack_payload), 0) == VCHIQ_RETRY)
                                goto bail_not_ready;
+
+                       /* The service is now open */
+                       set_service_state(service, VCHIQ_SRVSTATE_OPENSYNC);
                } else {
                        if (queue_message(state, NULL, openack_id, memcpy_copy_callback,
                                          &ack_payload, sizeof(ack_payload), 0) == VCHIQ_RETRY)
                                goto bail_not_ready;
-               }
 
-               /* The service is now open */
-               set_service_state(service, service->sync ? VCHIQ_SRVSTATE_OPENSYNC
-                                       : VCHIQ_SRVSTATE_OPEN);
+                       /* The service is now open */
+                       set_service_state(service, VCHIQ_SRVSTATE_OPEN);
+               }
        }
 
        /* Success - the message has been dealt with */