Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d3a4e613 authored by Michael Zoran's avatar Michael Zoran Committed by Greg Kroah-Hartman
Browse files

staging: bcm2835/mmal-vchiq: Replace call to vchi_msg_queue with vchi_queue_kernel_message 



The function vchi_msg_queue was made static in vc04_services
and replaced with vchi_queue_kernel_message.

Change the call to vchi_msg_queue to vchi_queue_kernel_message

Signed-off-by: default avatarMichael Zoran <mzoran@crowfest.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c07acb97

drivers/staging/media/platform/bcm2835/mmal-vchiq.c

+8 −15
Original line number Diff line number Diff line
@@ -378,14 +378,6 @@ static int inline_receive(struct vchiq_mmal_instance *instance, 
	return 0;

}



static ssize_t mmal_memcpy_wrapper(void *src, void *dst,

				   size_t offset, size_t size)

{

	memcpy(dst + offset, src + offset, size);



	return size;

}



/* queue the buffer availability with MMAL_MSG_TYPE_BUFFER_FROM_HOST */

static int

buffer_from_host(struct vchiq_mmal_instance *instance,
@@ -450,7 +442,8 @@ buffer_from_host(struct vchiq_mmal_instance *instance, 


	vchi_service_use(instance->handle);



	ret = vchi_msg_queue(instance->handle, mmal_memcpy_wrapper, &m,

	ret = vchi_queue_kernel_message(instance->handle,

					&m,

					sizeof(struct mmal_msg_header) +

					sizeof(m.u.buffer_from_host));
@@ -736,10 +729,10 @@ static int send_synchronous_mmal_msg(struct vchiq_mmal_instance *instance, 


	vchi_service_use(instance->handle);



	ret = vchi_msg_queue(instance->handle,

			     mmal_memcpy_wrapper,

	ret = vchi_queue_kernel_message(instance->handle,

					msg,

			     sizeof(struct mmal_msg_header) + payload_len);

					sizeof(struct mmal_msg_header) +

					payload_len);



	vchi_service_release(instance->handle);