diff options
| author | Eric Anholt <eric@anholt.net> | 2017-01-27 13:54:59 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-01-31 10:44:27 +0100 |
| commit | 411d68bef922862286bae2ad3476f7a57f17ec79 (patch) | |
| tree | 9845ab12164d754b537e1dfa2432549f6231d471 | |
| parent | 7b3ad5abf027b7643b38c4006d7f4ce47a86dd3a (diff) | |
staging: bcm2835-v4l2: Update the driver to the current VCHI API.
49bec49fd7f2 ("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>
| -rw-r--r-- | drivers/staging/media/platform/bcm2835/mmal-vchiq.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/drivers/staging/media/platform/bcm2835/mmal-vchiq.c b/drivers/staging/media/platform/bcm2835/mmal-vchiq.c index 781322542d5a..24bd2948136c 100644 --- a/drivers/staging/media/platform/bcm2835/mmal-vchiq.c +++ b/drivers/staging/media/platform/bcm2835/mmal-vchiq.c @@ -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); |