Commit 640e7746 authored by Dave Stevenson's avatar Dave Stevenson Committed by Greg Kroah-Hartman

staging: mmal-vchiq: Avoid use of bool in structures

Fixes up a checkpatch error "Avoid using bool structure members
because of possible alignment issues".
Signed-off-by: default avatarDave Stevenson <dave.stevenson@raspberrypi.org>
Signed-off-by: default avatarStefan Wahren <wahrenst@gmx.net>
Acked-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Acked-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 66b5d073
...@@ -853,9 +853,9 @@ static int port_info_get(struct vchiq_mmal_instance *instance, ...@@ -853,9 +853,9 @@ static int port_info_get(struct vchiq_mmal_instance *instance,
goto release_msg; goto release_msg;
if (rmsg->u.port_info_get_reply.port.is_enabled == 0) if (rmsg->u.port_info_get_reply.port.is_enabled == 0)
port->enabled = false; port->enabled = 0;
else else
port->enabled = true; port->enabled = 1;
/* copy the values out of the message */ /* copy the values out of the message */
port->handle = rmsg->u.port_info_get_reply.port_handle; port->handle = rmsg->u.port_info_get_reply.port_handle;
...@@ -1292,7 +1292,7 @@ static int port_disable(struct vchiq_mmal_instance *instance, ...@@ -1292,7 +1292,7 @@ static int port_disable(struct vchiq_mmal_instance *instance,
if (!port->enabled) if (!port->enabled)
return 0; return 0;
port->enabled = false; port->enabled = 0;
ret = port_action_port(instance, port, ret = port_action_port(instance, port,
MMAL_MSG_PORT_ACTION_TYPE_DISABLE); MMAL_MSG_PORT_ACTION_TYPE_DISABLE);
...@@ -1344,7 +1344,7 @@ static int port_enable(struct vchiq_mmal_instance *instance, ...@@ -1344,7 +1344,7 @@ static int port_enable(struct vchiq_mmal_instance *instance,
if (ret) if (ret)
goto done; goto done;
port->enabled = true; port->enabled = 1;
if (port->buffer_cb) { if (port->buffer_cb) {
/* send buffer headers to videocore */ /* send buffer headers to videocore */
...@@ -1511,7 +1511,7 @@ int vchiq_mmal_port_connect_tunnel(struct vchiq_mmal_instance *instance, ...@@ -1511,7 +1511,7 @@ int vchiq_mmal_port_connect_tunnel(struct vchiq_mmal_instance *instance,
pr_err("failed disconnecting src port\n"); pr_err("failed disconnecting src port\n");
goto release_unlock; goto release_unlock;
} }
src->connected->enabled = false; src->connected->enabled = 0;
src->connected = NULL; src->connected = NULL;
} }
...@@ -1758,7 +1758,7 @@ int vchiq_mmal_component_disable(struct vchiq_mmal_instance *instance, ...@@ -1758,7 +1758,7 @@ int vchiq_mmal_component_disable(struct vchiq_mmal_instance *instance,
ret = disable_component(instance, component); ret = disable_component(instance, component);
if (ret == 0) if (ret == 0)
component->enabled = false; component->enabled = 0;
mutex_unlock(&instance->vchiq_mutex); mutex_unlock(&instance->vchiq_mutex);
......
...@@ -48,7 +48,7 @@ typedef void (*vchiq_mmal_buffer_cb)( ...@@ -48,7 +48,7 @@ typedef void (*vchiq_mmal_buffer_cb)(
unsigned long length, u32 mmal_flags, s64 dts, s64 pts); unsigned long length, u32 mmal_flags, s64 dts, s64 pts);
struct vchiq_mmal_port { struct vchiq_mmal_port {
bool enabled; u32 enabled:1;
u32 handle; u32 handle;
u32 type; /* port type, cached to use on port info set */ u32 type; /* port type, cached to use on port info set */
u32 index; /* port index, cached to use on port info set */ u32 index; /* port index, cached to use on port info set */
...@@ -82,7 +82,7 @@ struct vchiq_mmal_port { ...@@ -82,7 +82,7 @@ struct vchiq_mmal_port {
}; };
struct vchiq_mmal_component { struct vchiq_mmal_component {
bool enabled; u32 enabled:1;
u32 handle; /* VideoCore handle for component */ u32 handle; /* VideoCore handle for component */
u32 inputs; /* Number of input ports */ u32 inputs; /* Number of input ports */
u32 outputs; /* Number of output ports */ u32 outputs; /* Number of output ports */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment