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

Commit 411d68be authored by Eric Anholt's avatar Eric Anholt Committed by Greg Kroah-Hartman
Browse files

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



49bec49f ("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: default avatarEric Anholt <eric@anholt.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7b3ad5ab

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

+12 −5
Original line number Diff line number Diff line
@@ -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);