Commit 029a8a18 authored by Dominic Braun's avatar Dominic Braun Committed by Greg Kroah-Hartman
Browse files

staging: vc04_services: Remove VCHIQ_BULK_QUEUE_T typedef 



Typedefing structs is not encouraged in the kernel.

Signed-off-by: default avatarDominic Braun <inf.braun@fau.de>
Signed-off-by: default avatarTobias Büttner <tobias.buettner@fau.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent cf69fc52

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c

+7 −6
Original line number Diff line number Diff line
@@ -1201,7 +1201,7 @@ release_slot(VCHIQ_STATE_T *state, VCHIQ_SLOT_INFO_T *slot_info, 


/* Called by the slot handler - don't hold the bulk mutex */

static VCHIQ_STATUS_T

notify_bulks(VCHIQ_SERVICE_T *service, VCHIQ_BULK_QUEUE_T *queue,

notify_bulks(VCHIQ_SERVICE_T *service, struct vchiq_bulk_queue *queue,

	     int retry_poll)

{

	VCHIQ_STATUS_T status = VCHIQ_SUCCESS;
@@ -1352,7 +1352,8 @@ poll_services(VCHIQ_STATE_T *state) 


/* Called with the bulk_mutex held */

static void

abort_outstanding_bulks(VCHIQ_SERVICE_T *service, VCHIQ_BULK_QUEUE_T *queue)

abort_outstanding_bulks(VCHIQ_SERVICE_T *service,

			struct vchiq_bulk_queue *queue)

{

	int is_tx = (queue == &service->bulk_tx);
@@ -1731,7 +1732,7 @@ parse_rx_slots(VCHIQ_STATE_T *state) 
			if ((service->remoteport == remoteport)

				&& (service->srvstate !=

				VCHIQ_SRVSTATE_FREE)) {

				VCHIQ_BULK_QUEUE_T *queue;

				struct vchiq_bulk_queue *queue;

				VCHIQ_BULK_T *bulk;



				queue = (type == VCHIQ_MSG_BULK_RX_DONE) ?
@@ -2087,7 +2088,7 @@ sync_func(void *v) 
}



static void

init_bulk_queue(VCHIQ_BULK_QUEUE_T *queue)

init_bulk_queue(struct vchiq_bulk_queue *queue)

{

	queue->local_insert = 0;

	queue->remote_insert = 0;
@@ -3015,7 +3016,7 @@ VCHIQ_STATUS_T vchiq_bulk_transfer(VCHIQ_SERVICE_HANDLE_T handle, 
				   VCHIQ_BULK_DIR_T dir)

{

	VCHIQ_SERVICE_T *service = find_service_by_handle(handle);

	VCHIQ_BULK_QUEUE_T *queue;

	struct vchiq_bulk_queue *queue;

	VCHIQ_BULK_T *bulk;

	VCHIQ_STATE_T *state;

	struct bulk_waiter *bulk_waiter = NULL;

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h

+4 −4
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ typedef struct vchiq_bulk_struct { 
	int actual;

} VCHIQ_BULK_T;



typedef struct vchiq_bulk_queue_struct {

struct vchiq_bulk_queue {

	int local_insert;  /* Where to insert the next local bulk */

	int remote_insert; /* Where to insert the next remote bulk (master) */

	int process;       /* Bulk to transfer next */
@@ -258,7 +258,7 @@ typedef struct vchiq_bulk_queue_struct { 
	int remove;        /* Bulk to notify the local client of, and remove,

			   ** next */

	VCHIQ_BULK_T bulks[VCHIQ_NUM_SERVICE_BULKS];

} VCHIQ_BULK_QUEUE_T;

};



struct remote_event {

	int armed;
@@ -304,8 +304,8 @@ typedef struct vchiq_service_struct { 


	int service_use_count;



	VCHIQ_BULK_QUEUE_T bulk_tx;

	VCHIQ_BULK_QUEUE_T bulk_rx;

	struct vchiq_bulk_queue bulk_tx;

	struct vchiq_bulk_queue bulk_rx;



	struct completion remove_event;

	struct completion bulk_remove_event;