Commit 22ad7f6b authored by Tuomas Tynkkynen's avatar Tuomas Tynkkynen Committed by Greg Kroah-Hartman
Browse files

staging: vc04_services: Drop 'connection' field from SERVICE_CREATION_T 



The connection field of SERVICE_CREATION_T is assigned to but its value
is never read. Drop the field and the resulting no longer needed code
from bcm2835-audio and bcm2835-camera.

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 3deb90fe

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

+0 −3
Original line number Diff line number Diff line
@@ -125,13 +125,11 @@ static void audio_vchi_callback(void *param, 


static int

vc_vchi_audio_init(VCHI_INSTANCE_T vchi_instance,

		   VCHI_CONNECTION_T *vchi_connection,

		   struct bcm2835_audio_instance *instance)

{

	SERVICE_CREATION_T params = {

		.version		= VCHI_VERSION_EX(VC_AUDIOSERV_VER, VC_AUDIOSERV_MIN_VER),

		.service_id		= VC_AUDIO_SERVER_NAME,

		.connection		= vchi_connection,

		.rx_fifo_size		= 0,

		.tx_fifo_size		= 0,

		.callback		= audio_vchi_callback,
@@ -228,7 +226,6 @@ int bcm2835_audio_open(struct bcm2835_alsa_stream *alsa_stream) 
	alsa_stream->instance = instance;



	err = vc_vchi_audio_init(vchi_ctx->vchi_instance,

				 vchi_ctx->vchi_connection,

				 instance);

	if (err < 0)

		goto free_instance;

drivers/staging/vc04_services/bcm2835-audio/bcm2835.h

+0 −1
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ enum snd_bcm2835_ctrl { 


struct bcm2835_vchi_ctx {

	VCHI_INSTANCE_T vchi_instance;

	VCHI_CONNECTION_T *vchi_connection;

};



/* definition of the chip-specific record */

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

+0 −2
Original line number Diff line number Diff line
@@ -1802,12 +1802,10 @@ int vchiq_mmal_init(struct vchiq_mmal_instance **out_instance) 
{

	int status;

	struct vchiq_mmal_instance *instance;

	static VCHI_CONNECTION_T *vchi_connection;

	static VCHI_INSTANCE_T vchi_instance;

	SERVICE_CREATION_T params = {

		.version		= VCHI_VERSION_EX(VC_MMAL_VER, VC_MMAL_MIN_VER),

		.service_id		= VC_MMAL_SERVER_NAME,

		.connection		= vchi_connection,

		.rx_fifo_size		= 0,

		.tx_fifo_size		= 0,

		.callback		= service_callback,

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

+0 −1
Original line number Diff line number Diff line
@@ -77,7 +77,6 @@ typedef struct { 
typedef struct {

	struct vchi_version version;

	int32_t service_id;

	VCHI_CONNECTION_T *connection;

	uint32_t rx_fifo_size;

	uint32_t tx_fifo_size;

	VCHI_CALLBACK_T callback;

CRA Git | Maintained and supported by SUSTech CRA and CCSE