diff options
| author | Michael Zoran <mzoran@crowfest.net> | 2017-02-01 17:31:54 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-02-02 15:01:31 +0300 |
| commit | d3a4e613bcc3212be7bcf93096a351ad81da246e (patch) | |
| tree | 022f5953c9e3ebd1b4105e2872b49ee67ca86bda /drivers/staging/media/platform/bcm2835 | |
| parent | c07acb97fd564cffcfd7bdc18eab9278bd448633 (diff) | |
| download | linux-d3a4e613bcc3212be7bcf93096a351ad81da246e.tar.xz | |
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>
Diffstat (limited to 'drivers/staging/media/platform/bcm2835')
| -rw-r--r-- | drivers/staging/media/platform/bcm2835/mmal-vchiq.c | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/drivers/staging/media/platform/bcm2835/mmal-vchiq.c b/drivers/staging/media/platform/bcm2835/mmal-vchiq.c index f71dc3e9c3ae..f0639ee6c8b9 100644 --- a/drivers/staging/media/platform/bcm2835/mmal-vchiq.c +++ b/drivers/staging/media/platform/bcm2835/mmal-vchiq.c @@ -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); |