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: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Acked-by: Stefan Wahren <stefan.wahren@i2se.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c
index 0bdaea1fdd777b76e2aa8a5fbcd3bf89bba14ada..6ec15e44d7e2ee85c8dcbf9b890cbc03d1b64585 100644 (file)
--- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c
+++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c
@@ -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;

diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.h b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.h
index e13435d1c2051025634bf4e0afa1febfb19a0cc1..34a0125ce646ab30ecfe666f0e3d1b8cfb7989cf 100644 (file)
--- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.h
+++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.h
@@ -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 */

diff --git a/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c b/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c
index 6e5c1d4ee12269e2dce9a53ccded4c17dca9b6de..e234b95b61c0482b05a8533f18d8ef8ee038f2e9 100644 (file)
--- a/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c
+++ b/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c
@@ -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,

diff --git a/drivers/staging/vc04_services/interface/vchi/vchi.h b/drivers/staging/vc04_services/interface/vchi/vchi.h
index 392c78200e9dc923e3a877440d85390698e607ae..1ea997c658f936c2af75783378429eac24c55132 100644 (file)
--- a/drivers/staging/vc04_services/interface/vchi/vchi.h
+++ b/drivers/staging/vc04_services/interface/vchi/vchi.h
@@ -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;