You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
94 lines
2.8 KiB
Diff
94 lines
2.8 KiB
Diff
From 3789c3b08b56f471878c493fd80a2eee776b527c Mon Sep 17 00:00:00 2001
|
|
From: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
|
Date: Mon, 29 Oct 2018 16:20:46 +0000
|
|
Subject: [PATCH] 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: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
|
---
|
|
.../staging/vc04_services/vchiq-mmal/mmal-vchiq.c | 14 +++++++-------
|
|
.../staging/vc04_services/vchiq-mmal/mmal-vchiq.h | 4 ++--
|
|
2 files changed, 9 insertions(+), 9 deletions(-)
|
|
|
|
--- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
|
|
+++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
|
|
@@ -861,9 +861,9 @@ static int port_info_get(struct vchiq_mm
|
|
goto release_msg;
|
|
|
|
if (rmsg->u.port_info_get_reply.port.is_enabled == 0)
|
|
- port->enabled = false;
|
|
+ port->enabled = 0;
|
|
else
|
|
- port->enabled = true;
|
|
+ port->enabled = 1;
|
|
|
|
/* copy the values out of the message */
|
|
port->handle = rmsg->u.port_info_get_reply.port_handle;
|
|
@@ -1300,7 +1300,7 @@ static int port_disable(struct vchiq_mma
|
|
if (!port->enabled)
|
|
return 0;
|
|
|
|
- port->enabled = false;
|
|
+ port->enabled = 0;
|
|
|
|
ret = port_action_port(instance, port,
|
|
MMAL_MSG_PORT_ACTION_TYPE_DISABLE);
|
|
@@ -1352,7 +1352,7 @@ static int port_enable(struct vchiq_mmal
|
|
if (ret)
|
|
goto done;
|
|
|
|
- port->enabled = true;
|
|
+ port->enabled = 1;
|
|
|
|
if (port->buffer_cb) {
|
|
/* send buffer headers to videocore */
|
|
@@ -1524,7 +1524,7 @@ int vchiq_mmal_port_connect_tunnel(struc
|
|
pr_err("failed disconnecting src port\n");
|
|
goto release_unlock;
|
|
}
|
|
- src->connected->enabled = false;
|
|
+ src->connected->enabled = 0;
|
|
src->connected = NULL;
|
|
}
|
|
|
|
@@ -1760,7 +1760,7 @@ int vchiq_mmal_component_enable(struct v
|
|
|
|
ret = enable_component(instance, component);
|
|
if (ret == 0)
|
|
- component->enabled = true;
|
|
+ component->enabled = 1;
|
|
|
|
mutex_unlock(&instance->vchiq_mutex);
|
|
|
|
@@ -1786,7 +1786,7 @@ int vchiq_mmal_component_disable(struct
|
|
|
|
ret = disable_component(instance, component);
|
|
if (ret == 0)
|
|
- component->enabled = false;
|
|
+ component->enabled = 0;
|
|
|
|
mutex_unlock(&instance->vchiq_mutex);
|
|
|
|
--- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h
|
|
+++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h
|
|
@@ -48,7 +48,7 @@ typedef void (*vchiq_mmal_buffer_cb)(
|
|
unsigned long length, u32 mmal_flags, s64 dts, s64 pts);
|
|
|
|
struct vchiq_mmal_port {
|
|
- bool enabled;
|
|
+ u32 enabled:1;
|
|
u32 handle;
|
|
u32 type; /* port type, cached to use on port info set */
|
|
u32 index; /* port index, cached to use on port info set */
|
|
@@ -83,7 +83,7 @@ struct vchiq_mmal_port {
|
|
|
|
struct vchiq_mmal_component {
|
|
u32 in_use:1;
|
|
- bool enabled;
|
|
+ u32 enabled:1;
|
|
u32 handle; /* VideoCore handle for component */
|
|
u32 inputs; /* Number of input ports */
|
|
u32 outputs; /* Number of output ports */
|