Commit 8757f705 authored by Gaston Gonzalez's avatar Gaston Gonzalez Committed by Greg Kroah-Hartman
Browse files

staging: vchiq_dev: cleanup code alignment issues 



Fix code alignment issues.

Reported by checkpatch.pl

Signed-off-by: default avatarGaston Gonzalez <gascoar@gmail.com>
Link: https://lore.kernel.org/r/20210912133751.269885-2-gascoar@gmail.com


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

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

+42 −62
Original line number Diff line number Diff line
@@ -235,8 +235,7 @@ static int vchiq_ioc_dequeue_message(struct vchiq_instance *instance, 
		do {

			spin_unlock(&msg_queue_spinlock);

			DEBUG_TRACE(DEQUEUE_MESSAGE_LINE);

			if (wait_for_completion_interruptible(

				&user_service->insert_event)) {

			if (wait_for_completion_interruptible(&user_service->insert_event)) {

				vchiq_log_info(vchiq_arm_log_level,

					       "DEQUEUE_MESSAGE interrupted");

				ret = -EINTR;
@@ -266,8 +265,7 @@ static int vchiq_ioc_dequeue_message(struct vchiq_instance *instance, 
		ret = -ENOTCONN;

	} else if (header->size <= args->bufsize) {

		/* Copy to user space if msgbuf is not NULL */

		if (!args->buf || (copy_to_user(args->buf,

					header->data, header->size) == 0)) {

		if (!args->buf || (copy_to_user(args->buf, header->data, header->size) == 0)) {

			ret = header->size;

			vchiq_release_message(service->handle, header);

		} else {
@@ -323,14 +321,12 @@ static int vchiq_irq_queue_bulk_tx_rx(struct vchiq_instance *instance, 
		mutex_unlock(&instance->bulk_waiter_list_mutex);

		if (!found) {

			vchiq_log_error(vchiq_arm_log_level,

				"no bulk_waiter found for pid %d",

				current->pid);

					"no bulk_waiter found for pid %d", current->pid);

			ret = -ESRCH;

			goto out;

		}

		vchiq_log_info(vchiq_arm_log_level,

			"found bulk_waiter %pK for pid %d", waiter,

			current->pid);

			       "found bulk_waiter %pK for pid %d", waiter, current->pid);

		userdata = &waiter->bulk_waiter;

	} else {

		userdata = args->userdata;
@@ -362,8 +358,7 @@ static int vchiq_irq_queue_bulk_tx_rx(struct vchiq_instance *instance, 
		list_add(&waiter->list, &instance->bulk_waiter_list);

		mutex_unlock(&instance->bulk_waiter_list_mutex);

		vchiq_log_info(vchiq_arm_log_level,

			"saved bulk_waiter %pK for pid %d",

			waiter, current->pid);

			       "saved bulk_waiter %pK for pid %d", waiter, current->pid);



		ret = put_user(mode_waiting, mode);

	}
@@ -453,14 +448,12 @@ static int vchiq_ioc_await_completion(struct vchiq_instance *instance, 
	mutex_lock(&instance->completion_mutex);



	DEBUG_TRACE(AWAIT_COMPLETION_LINE);

	while ((instance->completion_remove == instance->completion_insert)

		&& !instance->closing) {

	while ((instance->completion_remove == instance->completion_insert) && !instance->closing) {

		int rc;



		DEBUG_TRACE(AWAIT_COMPLETION_LINE);

		mutex_unlock(&instance->completion_mutex);

		rc = wait_for_completion_interruptible(

					&instance->insert_event);

		rc = wait_for_completion_interruptible(&instance->insert_event);

		mutex_lock(&instance->completion_mutex);

		if (rc) {

			DEBUG_TRACE(AWAIT_COMPLETION_LINE);
@@ -485,8 +478,7 @@ static int vchiq_ioc_await_completion(struct vchiq_instance *instance, 
		if (remove == instance->completion_insert)

			break;



		completion = &instance->completions[

			remove & (MAX_COMPLETIONS - 1)];

		completion = &instance->completions[remove & (MAX_COMPLETIONS - 1)];



		/*

		 * A read memory barrier is needed to stop
@@ -593,10 +585,8 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
	int i, rc;



	vchiq_log_trace(vchiq_arm_log_level,

		"%s - instance %pK, cmd %s, arg %lx",

		__func__, instance,

		((_IOC_TYPE(cmd) == VCHIQ_IOC_MAGIC) &&

		(_IOC_NR(cmd) <= VCHIQ_IOC_MAX)) ?

			"%s - instance %pK, cmd %s, arg %lx", __func__, instance,

			((_IOC_TYPE(cmd) == VCHIQ_IOC_MAGIC) && (_IOC_NR(cmd) <= VCHIQ_IOC_MAX)) ?

			ioctl_names[_IOC_NR(cmd)] : "<invalid>", arg);



	switch (cmd) {
@@ -697,8 +687,7 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
		 * CLOSE_DELIVERED ioctl, signalling close_event.

		 */

		if (user_service->close_pending &&

			wait_for_completion_interruptible(

				&user_service->close_event))

		    wait_for_completion_interruptible(&user_service->close_event))

			status = VCHIQ_RETRY;

		break;

	}
@@ -715,13 +704,11 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
			if (ret) {

				vchiq_log_error(vchiq_susp_log_level,

						"%s: cmd %s returned error %ld for service %c%c%c%c:%03d",

					__func__,

					(cmd == VCHIQ_IOC_USE_SERVICE) ?

						__func__, (cmd == VCHIQ_IOC_USE_SERVICE) ?

						"VCHIQ_IOC_USE_SERVICE" :

						"VCHIQ_IOC_RELEASE_SERVICE",

					ret,

					VCHIQ_FOURCC_AS_4CHARS(

						service->base.fourcc),

					VCHIQ_FOURCC_AS_4CHARS(service->base.fourcc),

					service->client_id);

			}

		} else {
@@ -883,23 +870,16 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
			ret = -EINTR;

	}



	if ((status == VCHIQ_SUCCESS) && (ret < 0) && (ret != -EINTR) &&

		(ret != -EWOULDBLOCK))

	if ((status == VCHIQ_SUCCESS) && (ret < 0) && (ret != -EINTR) && (ret != -EWOULDBLOCK))

		vchiq_log_info(vchiq_arm_log_level,

			       "  ioctl instance %pK, cmd %s -> status %d, %ld",

			instance,

			(_IOC_NR(cmd) <= VCHIQ_IOC_MAX) ?

				ioctl_names[_IOC_NR(cmd)] :

				"<invalid>",

			status, ret);

			       instance, (_IOC_NR(cmd) <= VCHIQ_IOC_MAX) ?

			       ioctl_names[_IOC_NR(cmd)] : "<invalid>", status, ret);

	else

		vchiq_log_trace(vchiq_arm_log_level,

				"  ioctl instance %pK, cmd %s -> status %d, %ld",

			instance,

			(_IOC_NR(cmd) <= VCHIQ_IOC_MAX) ?

				ioctl_names[_IOC_NR(cmd)] :

				"<invalid>",

			status, ret);

				instance, (_IOC_NR(cmd) <= VCHIQ_IOC_MAX) ?

				ioctl_names[_IOC_NR(cmd)] : "<invalid>", status, ret);



	return ret;

}
@@ -1297,8 +1277,8 @@ static int vchiq_release(struct inode *inode, struct file *file) 
		struct vchiq_completion_data_kernel *completion;

		struct vchiq_service *service;



		completion = &instance->completions[

			instance->completion_remove & (MAX_COMPLETIONS - 1)];

		completion = &instance->completions[instance->completion_remove

						    & (MAX_COMPLETIONS - 1)];

		service = completion->service_userdata;

		if (completion->reason == VCHIQ_SERVICE_CLOSED) {

			struct user_service *user_service =