staging: vc04_services: Drop trivially unused fields from SERVICE_CREATION_T

These fields are only initialized with constants and never read. Drop
them.

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 6ec15e44d7e2ee85c8dcbf9b890cbc03d1b64585..bc48a74a6be6cf208eebe908182b6a5d92924334 100644 (file)
--- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c
+++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c
@@ -130,13 +130,8 @@ vc_vchi_audio_init(VCHI_INSTANCE_T vchi_instance,
        SERVICE_CREATION_T params = {
                .version                = VCHI_VERSION_EX(VC_AUDIOSERV_VER, VC_AUDIOSERV_MIN_VER),
                .service_id             = VC_AUDIO_SERVER_NAME,
-               .rx_fifo_size           = 0,
-               .tx_fifo_size           = 0,
                .callback               = audio_vchi_callback,
                .callback_param         = instance,
-               .want_unaligned_bulk_rx = 1, //TODO: remove VCOS_FALSE
-               .want_unaligned_bulk_tx = 1, //TODO: remove VCOS_FALSE
-               .want_crc               = 0
        };
        int status;
 

diff --git a/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c b/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c
index e234b95b61c0482b05a8533f18d8ef8ee038f2e9..074a4acc196d47e94b107129f0457b030c930032 100644 (file)
--- a/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c
+++ b/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c
@@ -1806,13 +1806,8 @@ int vchiq_mmal_init(struct vchiq_mmal_instance **out_instance)
        SERVICE_CREATION_T params = {
                .version                = VCHI_VERSION_EX(VC_MMAL_VER, VC_MMAL_MIN_VER),
                .service_id             = VC_MMAL_SERVER_NAME,
-               .rx_fifo_size           = 0,
-               .tx_fifo_size           = 0,
                .callback               = service_callback,
                .callback_param         = NULL,
-               .want_unaligned_bulk_rx = 1,
-               .want_unaligned_bulk_tx = 1,
-               .want_crc               = 0
        };
 
        /* compile time checks to ensure structure size as they are

diff --git a/drivers/staging/vc04_services/interface/vchi/vchi.h b/drivers/staging/vc04_services/interface/vchi/vchi.h
index 1ea997c658f936c2af75783378429eac24c55132..347825329ea4aa3e6f1bf9b82212268ac77cbccc 100644 (file)
--- a/drivers/staging/vc04_services/interface/vchi/vchi.h
+++ b/drivers/staging/vc04_services/interface/vchi/vchi.h
@@ -77,19 +77,8 @@ typedef struct {
 typedef struct {
        struct vchi_version version;
        int32_t service_id;
-       uint32_t rx_fifo_size;
-       uint32_t tx_fifo_size;
        VCHI_CALLBACK_T callback;
        void *callback_param;
-       /* client intends to receive bulk transfers of
-               odd lengths or into unaligned buffers */
-       int32_t want_unaligned_bulk_rx;
-       /* client intends to transmit bulk transfers of
-               odd lengths or out of unaligned buffers */
-       int32_t want_unaligned_bulk_tx;
-       /* client wants to check CRCs on (bulk) xfers.
-               Only needs to be set at 1 end - will do both directions. */
-       int32_t want_crc;
 } SERVICE_CREATION_T;
 
 // Opaque handle for a VCHI instance