hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Michael Zoran <mzoran@crowfest.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Michael Zoran 2017-02-01 06:31:54 -08:00 committed by Greg Kroah-Hartman
parent c07acb97fd
commit d3a4e613bc
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/staging/media/platform/bcm2835/mmal-vchiq.c
View File

@ -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,9 +442,10 @@ buffer_from_host(struct vchiq_mmal_instance *instance,
vchi_service_use(instance->handle);
ret = vchi_msg_queue(instance->handle, mmal_memcpy_wrapper, &m,
sizeof(struct mmal_msg_header) +
sizeof(m.u.buffer_from_host));
ret = vchi_queue_kernel_message(instance->handle,
&m,
sizeof(struct mmal_msg_header) +
sizeof(m.u.buffer_from_host));
if (ret != 0) {
release_msg_context(msg_context);
@ -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,
msg,
sizeof(struct mmal_msg_header) + payload_len);
ret = vchi_queue_kernel_message(instance->handle,
msg,
sizeof(struct mmal_msg_header) +
payload_len);
vchi_service_release(instance->handle);