leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: bcm2835-camera: Convert client_component field to u32

Browse Source 
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 <mzoran@crowfest.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Michael Zoran
2017-03-09 21:08:51 -08:00
committed by Greg Kroah-Hartman
parent ad428fc0af
commit 4fe0809309
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/vc04_services/bcm2835-camera/mmal-msg.h
View File

@@ -101,7 +101,7 @@ struct mmal_msg_version {
/* request to VC to create component */ /* request to VC to create component */
struct mmal_msg_component_create { struct mmal_msg_component_create {
void *client_component; /* component context */ u32 client_component; /* component context */
char name[128]; char name[128];
u32 pid; /* For debug */ u32 pid; /* For debug */
}; };
@@ -339,7 +339,7 @@ struct mmal_msg_port_parameter_get_reply {
#define MMAL_WORKER_EVENT_SPACE 256 #define MMAL_WORKER_EVENT_SPACE 256
struct mmal_msg_event_to_host { struct mmal_msg_event_to_host {
void *client_component; /* component context */ u32 client_component; /* component context */
u32 port_type; u32 port_type;
u32 port_num; u32 port_num;

4
drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c
View File

@@ -297,7 +297,7 @@ static void event_to_host_cb(struct vchiq_mmal_instance *instance,
struct mmal_msg *msg, u32 msg_len) struct mmal_msg *msg, u32 msg_len)
{ {
pr_debug("unhandled event\n"); 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.client_component,
msg->u.event_to_host.port_type, msg->u.event_to_host.port_type,
msg->u.event_to_host.port_num, msg->u.event_to_host.port_num,
@@ -1105,7 +1105,7 @@ static int create_component(struct vchiq_mmal_instance *instance,
/* build component create message */ /* build component create message */
m.h.type = MMAL_MSG_TYPE_COMPONENT_CREATE; 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, strncpy(m.u.component_create.name, name,
sizeof(m.u.component_create.name)); sizeof(m.u.component_create.name));