Commit efbec169 authored by Dave Stevenson's avatar Dave Stevenson Committed by popcornmix
Browse files

staging: vc-sm-cma: Fixup driver for older VCHI APIs 



Original patch was based off staging which included some cleanups
of the VCHI APIs. Those aren't present here, so switch back to
the older API.

Signed-off-by: default avatarDave Stevenson <dave.stevenson@raspberrypi.org>
parent 49c6695c

drivers/staging/vc04_services/vc-sm-cma/vc_sm.c

+1 −1
Original line number Diff line number Diff line
@@ -632,7 +632,7 @@ static void vc_sm_connected_init(void) 
		goto err_free_mem;

	}



	ret = vchi_connect(vchi_instance);

	ret = vchi_connect(NULL, 0, vchi_instance);

	if (ret) {

		pr_err("[%s]: failed to connect VCHI instance (ret=%d)\n",

		       __func__, ret);

drivers/staging/vc04_services/vc-sm-cma/vc_sm_cma_vchi.c

+5 −0
Original line number Diff line number Diff line
@@ -325,8 +325,13 @@ struct sm_instance *vc_sm_cma_vchi_init(VCHI_INSTANCE_T vchi_instance, 
		SERVICE_CREATION_T params = {

			.version = VCHI_VERSION_EX(VC_SM_VER, VC_SM_MIN_VER),

			.service_id = VC_SM_SERVER_NAME,

			.rx_fifo_size = 0,

			.tx_fifo_size = 0,

			.callback = vc_sm_cma_vchi_callback,

			.callback_param = instance,

			.want_unaligned_bulk_rx = 0,

			.want_unaligned_bulk_tx = 0,

			.want_crc = 0

		};



		status = vchi_service_open(vchi_instance,