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

staging: vchiq_core: fix if alignments 



This fixes the alignment of some if statements.

Signed-off-by: default avatarStefan Wahren <stefan.wahren@i2se.com>
Link: https://lore.kernel.org/r/1618164700-21150-10-git-send-email-stefan.wahren@i2se.com


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

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

+18 −22
Original line number Diff line number Diff line
@@ -1681,8 +1681,7 @@ parse_rx_slots(struct vchiq_state *state) 
				"%d: prs OPENACK@%pK,%x (%d->%d) v:%d",

				state->id, header, size, remoteport, localport,

				service->peer_version);

			if (service->srvstate ==

				VCHIQ_SRVSTATE_OPENING) {

			if (service->srvstate == VCHIQ_SRVSTATE_OPENING) {

				service->remoteport = remoteport;

				vchiq_set_service_state(service,

					VCHIQ_SRVSTATE_OPEN);
@@ -1716,9 +1715,8 @@ parse_rx_slots(struct vchiq_state *state) 
				"%d: prs DATA@%pK,%x (%d->%d)",

				state->id, header, size, remoteport, localport);



			if ((service->remoteport == remoteport)

				&& (service->srvstate ==

				VCHIQ_SRVSTATE_OPEN)) {

			if ((service->remoteport == remoteport) &&

			    (service->srvstate == VCHIQ_SRVSTATE_OPEN)) {

				header->msgid = msgid | VCHIQ_MSGID_CLAIMED;

				claim_slot(state->rx_info);

				DEBUG_TRACE(PARSE_LINE);
@@ -1753,9 +1751,8 @@ parse_rx_slots(struct vchiq_state *state) 
			break;

		case VCHIQ_MSG_BULK_RX_DONE:

		case VCHIQ_MSG_BULK_TX_DONE:

			if ((service->remoteport == remoteport)

				&& (service->srvstate !=

				VCHIQ_SRVSTATE_FREE)) {

			if ((service->remoteport == remoteport) &&

			    (service->srvstate != VCHIQ_SRVSTATE_FREE)) {

				struct vchiq_bulk_queue *queue;

				struct vchiq_bulk *bulk;
@@ -2445,10 +2442,9 @@ vchiq_add_service_internal(struct vchiq_state *state, 
			srv = rcu_dereference(state->services[i]);

			if (!srv)

				pservice = &state->services[i];

			else if ((srv->public_fourcc == params->fourcc)

				&& ((srv->instance != instance) ||

				(srv->base.callback !=

				params->callback))) {

			else if ((srv->public_fourcc == params->fourcc) &&

				 ((srv->instance != instance) ||

				  (srv->base.callback != params->callback))) {

				/*

				 * There is another server using this

				 * fourcc which doesn't match.