In the messages passed back and forth between the camera and
the firmware, a client_component field is passed.
This is a pointer to a structure that represents part of the
camera. Luckly, it's only used for debug logging, so simply
convert it to a u32.
Signed-off-by: Michael Zoran <mzo...@crowfest.net>
---
drivers/staging/vc04_services/bcm2835-camera/mmal-msg.h | 4 ++--
drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/vc04_services/bcm2835-camera/mmal-msg.h
b/drivers/staging/vc04_services/bcm2835-camera/mmal-msg.h
index e697425f60c4..729402c14780 100644
--- a/drivers/staging/vc04_services/bcm2835-camera/mmal-msg.h
+++ b/drivers/staging/vc04_services/bcm2835-camera/mmal-msg.h
@@ -101,7 +101,7 @@ struct mmal_msg_version {
/* request to VC to create component */
struct mmal_msg_component_create {
- void *client_component; /* component context */
+ u32 client_component; /* component context */
char name[128];
u32 pid; /* For debug */
};
@@ -339,7 +339,7 @@ struct mmal_msg_port_parameter_get_reply {
#define MMAL_WORKER_EVENT_SPACE 256
struct mmal_msg_event_to_host {
- void *client_component; /* component context */
+ u32 client_component; /* component context */
u32 port_type;
u32 port_num;
diff --git a/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c
b/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c
index 6126919a31da..c59b4cdb9489 100644
--- a/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c
+++ b/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c
@@ -297,7 +297,7 @@ static void event_to_host_cb(struct vchiq_mmal_instance
*instance,
struct mmal_msg *msg, u32 msg_len)
{
pr_debug("unhandled event\n");
- pr_debug("component:%p port type:%d num:%d cmd:0x%x length:%d\n",
+ pr_debug("component:%u port type:%d num:%d cmd:0x%x length:%d\n",
msg->u.event_to_host.client_component,
msg->u.event_to_host.port_type,
msg->u.event_to_host.port_num,
@@ -1105,7 +1105,7 @@ static int create_component(struct vchiq_mmal_instance
*instance,
/* build component create message */
m.h.type = MMAL_MSG_TYPE_COMPONENT_CREATE;
- m.u.component_create.client_component = component;
+ m.u.component_create.client_component = (u32)(unsigned long)component;
strncpy(m.u.component_create.name, name,
sizeof(m.u.component_create.name));
--
2.11.0
_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
