Commit 96abfeca authored by Tuomas Tynkkynen's avatar Tuomas Tynkkynen Committed by Greg Kroah-Hartman
Browse files

staging: vc04_services: Drop unused parameters from vchi_connect() 



Remove two parameters which are never used and all where all callers
just pass in dummy values anyway.

Signed-off-by: default avatarTuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Acked-by: default avatarStefan Wahren <stefan.wahren@i2se.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5bc4ab85

drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c

+1 −1
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ int bcm2835_new_vchi_ctx(struct device *dev, struct bcm2835_vchi_ctx *vchi_ctx) 
		return -EIO;

	}



	ret = vchi_connect(NULL, 0, vchi_ctx->vchi_instance);

	ret = vchi_connect(vchi_ctx->vchi_instance);

	if (ret) {

		dev_dbg(dev, "failed to connect VCHI instance (ret=%d)\n",

			ret);

drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c

+1 −1
Original line number Diff line number Diff line
@@ -1831,7 +1831,7 @@ int vchiq_mmal_init(struct vchiq_mmal_instance **out_instance) 
		return -EIO;

	}



	status = vchi_connect(NULL, 0, vchi_instance);

	status = vchi_connect(vchi_instance);

	if (status) {

		pr_err("Failed to connect VCHI instance (status=%d)\n", status);

		return -EIO;

drivers/staging/vc04_services/interface/vchi/vchi.h

+1 −3
Original line number Diff line number Diff line
@@ -100,9 +100,7 @@ extern int32_t vchi_initialise(VCHI_INSTANCE_T *instance_handle); 


extern int32_t vchi_exit(void);



extern int32_t vchi_connect(VCHI_CONNECTION_T **connections,

			    const uint32_t num_connections,

			    VCHI_INSTANCE_T instance_handle);

extern int32_t vchi_connect(VCHI_INSTANCE_T instance_handle);



//When this is called, ensure that all services have no data pending.

//Bulk transfers can remain 'queued'

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c

+2 −9
Original line number Diff line number Diff line
@@ -490,9 +490,7 @@ EXPORT_SYMBOL(vchi_initialise); 
/***********************************************************

 * Name: vchi_connect

 *

 * Arguments: VCHI_CONNECTION_T **connections

 *            const uint32_t num_connections

 *            VCHI_INSTANCE_T instance_handle)

 * Arguments: VCHI_INSTANCE_T instance_handle

 *

 * Description: Starts the command service on each connection,

 *              causing INIT messages to be pinged back and forth
@@ -500,15 +498,10 @@ EXPORT_SYMBOL(vchi_initialise); 
 * Returns: 0 if successful, failure otherwise

 *

 ***********************************************************/

int32_t vchi_connect(VCHI_CONNECTION_T **connections,

	const uint32_t num_connections,

	VCHI_INSTANCE_T instance_handle)

int32_t vchi_connect(VCHI_INSTANCE_T instance_handle)

{

	VCHIQ_INSTANCE_T instance = (VCHIQ_INSTANCE_T)instance_handle;



	(void)connections;

	(void)num_connections;



	return vchiq_connect(instance);

}

EXPORT_SYMBOL(vchi_connect);

CRA Git | Maintained and supported by SUSTech CRA and CCSE