mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-12 21:57:43 +00:00
Code Issues Releases Wiki Activity

staging: bcm2835-v4l2: Update the driver to the current VCHI API.

Browse source 
49bec49fd7 ("staging: vc04_services: remove vchiq_copy_from_user")
removed the flags/msg_handle arguments, which were unused, and pushed
the implementation of copying using memcpy vs copy_from_user to the
caller.

Signed-off-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Eric Anholt 2017-01-27 13:54:59 -08:00 committed by Greg Kroah-Hartman
parent 7b3ad5abf0
commit 411d68bef9
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
drivers/staging/media/platform/bcm2835/mmal-vchiq.c
View file

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