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

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
...@@ -125,13 +125,11 @@ static void audio_vchi_callback(void *param, ...@@ -125,13 +125,11 @@ static void audio_vchi_callback(void *param,
static int static int
vc_vchi_audio_init(VCHI_INSTANCE_T vchi_instance, vc_vchi_audio_init(VCHI_INSTANCE_T vchi_instance,
VCHI_CONNECTION_T *vchi_connection,
struct bcm2835_audio_instance *instance) struct bcm2835_audio_instance *instance)
{ {
SERVICE_CREATION_T params = { SERVICE_CREATION_T params = {
.version = VCHI_VERSION_EX(VC_AUDIOSERV_VER, VC_AUDIOSERV_MIN_VER), .version = VCHI_VERSION_EX(VC_AUDIOSERV_VER, VC_AUDIOSERV_MIN_VER),
.service_id = VC_AUDIO_SERVER_NAME, .service_id = VC_AUDIO_SERVER_NAME,
.connection = vchi_connection,
.rx_fifo_size = 0, .rx_fifo_size = 0,
.tx_fifo_size = 0, .tx_fifo_size = 0,
.callback = audio_vchi_callback, .callback = audio_vchi_callback,
...@@ -228,7 +226,6 @@ int bcm2835_audio_open(struct bcm2835_alsa_stream *alsa_stream) ...@@ -228,7 +226,6 @@ int bcm2835_audio_open(struct bcm2835_alsa_stream *alsa_stream)
alsa_stream->instance = instance; alsa_stream->instance = instance;
err = vc_vchi_audio_init(vchi_ctx->vchi_instance, err = vc_vchi_audio_init(vchi_ctx->vchi_instance,
vchi_ctx->vchi_connection,
instance); instance);
if (err < 0) if (err < 0)
goto free_instance; goto free_instance;
......
...@@ -45,7 +45,6 @@ enum snd_bcm2835_ctrl { ...@@ -45,7 +45,6 @@ enum snd_bcm2835_ctrl {
struct bcm2835_vchi_ctx { struct bcm2835_vchi_ctx {
VCHI_INSTANCE_T vchi_instance; VCHI_INSTANCE_T vchi_instance;
VCHI_CONNECTION_T *vchi_connection;
}; };
/* definition of the chip-specific record */ /* definition of the chip-specific record */
......
...@@ -1802,12 +1802,10 @@ int vchiq_mmal_init(struct vchiq_mmal_instance **out_instance) ...@@ -1802,12 +1802,10 @@ int vchiq_mmal_init(struct vchiq_mmal_instance **out_instance)
{ {
int status; int status;
struct vchiq_mmal_instance *instance; struct vchiq_mmal_instance *instance;
static VCHI_CONNECTION_T *vchi_connection;
static VCHI_INSTANCE_T vchi_instance; static VCHI_INSTANCE_T vchi_instance;
SERVICE_CREATION_T params = { SERVICE_CREATION_T params = {
.version = VCHI_VERSION_EX(VC_MMAL_VER, VC_MMAL_MIN_VER), .version = VCHI_VERSION_EX(VC_MMAL_VER, VC_MMAL_MIN_VER),
.service_id = VC_MMAL_SERVER_NAME, .service_id = VC_MMAL_SERVER_NAME,
.connection = vchi_connection,
.rx_fifo_size = 0, .rx_fifo_size = 0,
.tx_fifo_size = 0, .tx_fifo_size = 0,
.callback = service_callback, .callback = service_callback,
......
...@@ -77,7 +77,6 @@ typedef struct { ...@@ -77,7 +77,6 @@ typedef struct {
typedef struct { typedef struct {
struct vchi_version version; struct vchi_version version;
int32_t service_id; int32_t service_id;
VCHI_CONNECTION_T *connection;
uint32_t rx_fifo_size; uint32_t rx_fifo_size;
uint32_t tx_fifo_size; uint32_t tx_fifo_size;
VCHI_CALLBACK_T callback; VCHI_CALLBACK_T callback;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment