staging: bcm2835-camera: Convert struct mmal_buffer_header info fields to u32

The struct mmal_buffer_header has multiple fields used for informational
and debugging purposes.  These are safe to convert to u32.

Signed-off-by: Michael Zoran <mzoran@crowfest.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/vc04_services/bcm2835-camera/mmal-msg.h b/drivers/staging/vc04_services/bcm2835-camera/mmal-msg.h
index 5d0de86f6c2b73dd104a8089dd57bc11f8e41a00..ee074be1dbe8334e2e86ea2ac7d8cd90f8d05505 100644 (file)
--- a/drivers/staging/vc04_services/bcm2835-camera/mmal-msg.h
+++ b/drivers/staging/vc04_services/bcm2835-camera/mmal-msg.h
@@ -255,18 +255,18 @@ struct mmal_driver_buffer {
 
 /* buffer header */
 struct mmal_buffer_header {
-       struct mmal_buffer_header *next; /* next header */
-       void *priv; /* framework private data */
+       u32 next; /* next header */
+       u32 priv; /* framework private data */
        u32 cmd;
-       void *data;
+       u32 data;
        u32 alloc_size;
        u32 length;
        u32 offset;
        u32 flags;
        s64 pts;
        s64 dts;
-       void *type;
-       void *user_data;
+       u32 type;
+       u32 user_data;
 };
 
 struct mmal_buffer_header_type_specific {

diff --git a/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c b/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c
index 26a6f27b0aaf386aa687b2f7dbf6a3ab5b93340e..f7d7f2ab45f1ee6fb442ac523abeb00560530e93 100644 (file)
--- a/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c
+++ b/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c
@@ -536,7 +536,8 @@ buffer_from_host(struct vchiq_mmal_instance *instance,
 
        /* buffer header */
        m.u.buffer_from_host.buffer_header.cmd = 0;
-       m.u.buffer_from_host.buffer_header.data = buf->buffer;
+       m.u.buffer_from_host.buffer_header.data =
+               (u32)(unsigned long)buf->buffer;
        m.u.buffer_from_host.buffer_header.alloc_size = buf->buffer_size;
        m.u.buffer_from_host.buffer_header.length = 0;  /* nothing used yet */
        m.u.buffer_from_host.buffer_header.offset = 0;  /* no offset */