Commit 5b5a4098 authored by Stefan Wahren's avatar Stefan Wahren Committed by Greg Kroah-Hartman
Browse files

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: default avatarNicolas Saenz Julienne <nsaenz@kernel.org>
Signed-off-by: default avatarStefan Wahren <stefan.wahren@i2se.com>
Link: https://lore.kernel.org/r/1642968143-19281-14-git-send-email-stefan.wahren@i2se.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d9bb2daa

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c

+6 −4
Original line number Diff line number Diff line
@@ -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);

			set_service_state(service, VCHIQ_SRVSTATE_OPEN);

		}

	}



	/* Success - the message has been dealt with */