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

staging: vchiq_arm: balance braces for if-else statements 



This fixes the following checkpatch notices in vchiq_arm:
CHECK: braces {} should be used on all arms of this statement

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


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

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

+8 −4
Original line number Diff line number Diff line
@@ -302,8 +302,9 @@ static enum vchiq_status vchiq_add_service( 
	if (service) {

		*phandle = service->handle;

		status = VCHIQ_SUCCESS;

	} else

	} else {

		status = VCHIQ_ERROR;

	}



	vchiq_log_trace(vchiq_core_log_level,

		"%s(%p): returning %d", __func__, instance, status);
@@ -942,8 +943,9 @@ static int vchiq_ioc_dequeue_message(struct vchiq_instance *instance, 
					header->data, header->size) == 0)) {

			ret = header->size;

			vchiq_release_message(service->handle, header);

		} else

		} else {

			ret = -EFAULT;

		}

	} else {

		vchiq_log_error(vchiq_arm_log_level,

			"header %pK: bufsize %x < size %x",
@@ -1401,8 +1403,9 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
						service->base.fourcc),

					service->client_id);

			}

		} else

		} else {

			ret = -EINVAL;

		}

	} break;



	case VCHIQ_IOC_QUEUE_MESSAGE: {
@@ -1539,8 +1542,9 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
			struct user_service *user_service =

				(struct user_service *)service->base.userdata;

			close_delivered(user_service);

		} else

		} else {

			ret = -EINVAL;

		}

	} break;



	default:

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

+24 −17
Original line number Diff line number Diff line
@@ -689,13 +689,13 @@ process_free_queue(struct vchiq_state *state, BITSET_T *service_found, 
						count - 1;

				spin_unlock(&quota_spinlock);



				if (count == quota->message_quota)

				if (count == quota->message_quota) {

					/*

					 * Signal the service that it

					 * has dropped below its quota

					 */

					complete(&quota->quota_event);

				else if (count == 0) {

				} else if (count == 0) {

					vchiq_log_error(vchiq_core_log_level,

						"service %d message_use_count=%d (header %pK, msgid %x, header->msgid %x, header->size %x)",

						port,
@@ -1691,10 +1691,11 @@ parse_rx_slots(struct vchiq_state *state) 
				vchiq_set_service_state(service,

					VCHIQ_SRVSTATE_OPEN);

				complete(&service->remove_event);

			} else

			} else {

				vchiq_log_error(vchiq_core_log_level,

					"OPENACK received in state %s",

					srvstate_names[service->srvstate]);

			}

			break;

		case VCHIQ_MSG_CLOSE:

			WARN_ON(size != 0); /* There should be no data */
@@ -2449,9 +2450,9 @@ vchiq_add_service_internal(struct vchiq_state *state, 
			struct vchiq_service *srv;



			srv = rcu_dereference(state->services[i]);

			if (!srv)

			if (!srv) {

				pservice = &state->services[i];

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

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

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

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

				/*
@@ -2654,10 +2655,12 @@ close_service_complete(struct vchiq_service *service, int failstate) 
				service->client_id = 0;

				service->remoteport = VCHIQ_PORT_FREE;

				newstate = VCHIQ_SRVSTATE_LISTENING;

			} else

			} else {

				newstate = VCHIQ_SRVSTATE_CLOSEWAIT;

		} else

			}

		} else {

			newstate = VCHIQ_SRVSTATE_CLOSED;

		}

		vchiq_set_service_state(service, newstate);

		break;

	case VCHIQ_SRVSTATE_LISTENING:
@@ -2687,16 +2690,17 @@ close_service_complete(struct vchiq_service *service, int failstate) 
		service->client_id = 0;

		service->remoteport = VCHIQ_PORT_FREE;



		if (service->srvstate == VCHIQ_SRVSTATE_CLOSED)

		if (service->srvstate == VCHIQ_SRVSTATE_CLOSED) {

			vchiq_free_service_internal(service);

		else if (service->srvstate != VCHIQ_SRVSTATE_CLOSEWAIT) {

		} else if (service->srvstate != VCHIQ_SRVSTATE_CLOSEWAIT) {

			if (is_server)

				service->closing = 0;



			complete(&service->remove_event);

		}

	} else

	} else {

		vchiq_set_service_state(service, failstate);

	}



	return status;

}
@@ -2718,11 +2722,11 @@ vchiq_close_service_internal(struct vchiq_service *service, int close_recvd) 
	case VCHIQ_SRVSTATE_HIDDEN:

	case VCHIQ_SRVSTATE_LISTENING:

	case VCHIQ_SRVSTATE_CLOSEWAIT:

		if (close_recvd)

		if (close_recvd) {

			vchiq_log_error(vchiq_core_log_level,

				"%s(1) called in state %s",

				__func__, srvstate_names[service->srvstate]);

		else if (is_server) {

		} else if (is_server) {

			if (service->srvstate == VCHIQ_SRVSTATE_LISTENING) {

				status = VCHIQ_ERROR;

			} else {
@@ -2734,8 +2738,9 @@ vchiq_close_service_internal(struct vchiq_service *service, int close_recvd) 
						VCHIQ_SRVSTATE_LISTENING);

			}

			complete(&service->remove_event);

		} else

		} else {

			vchiq_free_service_internal(service);

		}

		break;

	case VCHIQ_SRVSTATE_OPENING:

		if (close_recvd) {
@@ -3325,8 +3330,9 @@ vchiq_release_message(unsigned int handle, 


			release_slot(state, slot_info, header, service);

		}

	} else if (slot_index == remote->slot_sync)

	} else if (slot_index == remote->slot_sync) {

		release_message_sync(state, header);

	}



	unlock_service(service);

}
@@ -3620,8 +3626,9 @@ int vchiq_dump_service_state(void *dump_context, struct vchiq_service *service) 
				scnprintf(remoteport + len2,

					sizeof(remoteport) - len2,

					" (client %x)", service->client_id);

		} else

		} else {

			strcpy(remoteport, "n/a");

		}



		len += scnprintf(buf + len, sizeof(buf) - len,

			" '%c%c%c%c' remote %s (msg use %d/%d, slot use %d/%d)",