Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4fe08093 authored by Michael Zoran's avatar Michael Zoran Committed by Greg Kroah-Hartman
Browse files

staging: bcm2835-camera: Convert client_component field to u32 



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: default avatarMichael Zoran <mzoran@crowfest.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ad428fc0

drivers/staging/vc04_services/bcm2835-camera/mmal-msg.h

+2 −2
Original line number Diff line number Diff line
@@ -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;

drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c

+2 −2
Original line number Diff line number Diff line
@@ -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));