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

staging: vchiq_core: break early in vchiq_close_service_internal 



The logic in VCHIQ_SRVSTATE_OPEN* is unnecessary complex. Handle the error
case of queue_message() first makes it easier to read.

Btw we get the rid of the checkpatch warning:
WARNING: else is not generally useful after a break or return

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/1619347863-16080-3-git-send-email-stefan.wahren@i2se.com


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

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

+13 −13
Original line number Diff line number Diff line
@@ -2763,7 +2763,12 @@ vchiq_close_service_internal(struct vchiq_service *service, int close_recvd) 
				VCHIQ_MSG_DSTPORT(service->remoteport)),

				NULL, NULL, 0, QMFLAGS_NO_MUTEX_UNLOCK);



		if (status == VCHIQ_SUCCESS) {

		if (status != VCHIQ_SUCCESS) {

			if (service->srvstate == VCHIQ_SRVSTATE_OPENSYNC)

				mutex_unlock(&state->sync_mutex);

			break;

		}



		if (!close_recvd) {

			/* Change the state while the mutex is still held */

			vchiq_set_service_state(service,
@@ -2773,11 +2778,6 @@ vchiq_close_service_internal(struct vchiq_service *service, int close_recvd) 
				mutex_unlock(&state->sync_mutex);

			break;

		}

		} else if (service->srvstate == VCHIQ_SRVSTATE_OPENSYNC) {

			mutex_unlock(&state->sync_mutex);

			break;

		} else

			break;



		/* Change the state while the mutex is still held */

		vchiq_set_service_state(service, VCHIQ_SRVSTATE_CLOSERECVD);