Commit 73361173 authored by Umang Jain's avatar Umang Jain Committed by Greg Kroah-Hartman
Browse files

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



This reverts commit 640e7746.

In commit 7967656f ("coding-style: Clarify the expectations around
bool") the check to dis-allow bool structure members was removed from
checkpatch.pl. It promotes bool structure members to store boolean
values. This enhances code readability.

Signed-off-by: default avatarUmang Jain <umang.jain@ideasonboard.com>
Reviewed-by: default avatarDave Stevenson <dave.stevenson@raspberrypi.com>
Reviewed-by: default avatarKieran Bingham <kieran.bingham@ideasonboard.com>
Link: https://lore.kernel.org/r/20221118084244.199909-2-umang.jain@ideasonboard.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2b7962bd

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

+6 −6
Original line number Diff line number Diff line
@@ -863,9 +863,9 @@ static int port_info_get(struct vchiq_mmal_instance *instance, 
		goto release_msg;



	if (rmsg->u.port_info_get_reply.port.is_enabled == 0)

		port->enabled = 0;

		port->enabled = false;

	else

		port->enabled = 1;

		port->enabled = true;



	/* copy the values out of the message */

	port->handle = rmsg->u.port_info_get_reply.port_handle;
@@ -1304,7 +1304,7 @@ static int port_disable(struct vchiq_mmal_instance *instance, 
	if (!port->enabled)

		return 0;



	port->enabled = 0;

	port->enabled = false;



	ret = port_action_port(instance, port,

			       MMAL_MSG_PORT_ACTION_TYPE_DISABLE);
@@ -1359,7 +1359,7 @@ static int port_enable(struct vchiq_mmal_instance *instance, 
	if (ret)

		goto done;



	port->enabled = 1;

	port->enabled = true;



	if (port->buffer_cb) {

		/* send buffer headers to videocore */
@@ -1531,7 +1531,7 @@ int vchiq_mmal_port_connect_tunnel(struct vchiq_mmal_instance *instance, 
			pr_err("failed disconnecting src port\n");

			goto release_unlock;

		}

		src->connected->enabled = 0;

		src->connected->enabled = false;

		src->connected = NULL;

	}
@@ -1799,7 +1799,7 @@ int vchiq_mmal_component_disable(struct vchiq_mmal_instance *instance, 


	ret = disable_component(instance, component);

	if (ret == 0)

		component->enabled = 0;

		component->enabled = false;



	mutex_unlock(&instance->vchiq_mutex);

drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h

+2 −2
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ typedef void (*vchiq_mmal_buffer_cb)( 
		int status, struct mmal_buffer *buffer);



struct vchiq_mmal_port {

	u32 enabled:1;

	bool enabled;

	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;

	u32 enabled:1;

	bool enabled;

	u32 handle;  /* VideoCore handle for component */

	u32 inputs;  /* Number of input ports */

	u32 outputs; /* Number of output ports */