From 68aeab51063a8e7fd4c0b05dc9eeef085fa01fa0 Mon Sep 17 00:00:00 2001 From: Michael Zoran Date: Thu, 9 Mar 2017 21:08:55 -0800 Subject: [PATCH] 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 Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vc04_services/bcm2835-camera/mmal-msg.h | 10 +++++----- drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c | 3 ++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/staging/vc04_services/bcm2835-camera/mmal-msg.h b/drivers/staging/vc04_services/bcm2835-camera/mmal-msg.h index 5d0de86..ee074be 100644 --- 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 26a6f27..f7d7f2a 100644 --- 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 */ -- 2.7.4