iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

staging: vc04_services: Remove VCHIQ_BULK_T typedef

Browse Source 
Typedefing structs is not encouraged in the kernel.

Signed-off-by: Dominic Braun <inf.braun@fau.de>
Signed-off-by: Tobias Büttner <tobias.buettner@fau.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Dominic Braun 2018-12-14 13:04:49 +01:00 committed by Greg Kroah-Hartman
parent 029a8a1894
commit bc96a5f0f7
4 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
View File

@ -246,7 +246,8 @@ remote_event_signal(struct remote_event *event)
}
VCHIQ_STATUS_T
vchiq_prepare_bulk_data(VCHIQ_BULK_T *bulk, void *offset, int size, int dir)
vchiq_prepare_bulk_data(struct vchiq_bulk *bulk, void *offset, int size,
int dir)
{
struct vchiq_pagelist_info *pagelistinfo;
@ -270,7 +271,7 @@ vchiq_prepare_bulk_data(VCHIQ_BULK_T *bulk, void *offset, int size, int dir)
}
void
vchiq_complete_bulk(VCHIQ_BULK_T *bulk)
vchiq_complete_bulk(struct vchiq_bulk *bulk)
{
if (bulk && bulk->remote_data && bulk->actual)
free_pagelist((struct vchiq_pagelist_info *)bulk->remote_data,

4
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
View File

@ -484,7 +484,7 @@ vchiq_blocking_bulk_transfer(VCHIQ_SERVICE_HANDLE_T handle, void *data,
mutex_unlock(&instance->bulk_waiter_list_mutex);
if (waiter) {
VCHIQ_BULK_T *bulk = waiter->bulk_waiter.bulk;
struct vchiq_bulk *bulk = waiter->bulk_waiter.bulk;
if (bulk) {
/* This thread has an outstanding bulk transfer. */
@ -514,7 +514,7 @@ vchiq_blocking_bulk_transfer(VCHIQ_SERVICE_HANDLE_T handle, void *data,
VCHIQ_BULK_MODE_BLOCKING, dir);
if ((status != VCHIQ_RETRY) || fatal_signal_pending(current) ||
!waiter->bulk_waiter.bulk) {
VCHIQ_BULK_T *bulk = waiter->bulk_waiter.bulk;
struct vchiq_bulk *bulk = waiter->bulk_waiter.bulk;
if (bulk) {
/* Cancel the signal when the transfer

9
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
View File

@ -1216,7 +1216,7 @@ notify_bulks(VCHIQ_SERVICE_T *service, struct vchiq_bulk_queue *queue,
if (status == VCHIQ_SUCCESS) {
while (queue->remove != queue->remote_notify) {
VCHIQ_BULK_T *bulk =
struct vchiq_bulk *bulk =
&queue->bulks[BULK_INDEX(queue->remove)];
/* Only generate callbacks for non-dummy bulk
@ -1367,7 +1367,8 @@ abort_outstanding_bulks(VCHIQ_SERVICE_T *service,
while ((queue->process != queue->local_insert) ||
(queue->process != queue->remote_insert)) {
VCHIQ_BULK_T *bulk = &queue->bulks[BULK_INDEX(queue->process)];
struct vchiq_bulk *bulk =
&queue->bulks[BULK_INDEX(queue->process)];
if (queue->process == queue->remote_insert) {
/* fabricate a matching dummy bulk */
@ -1733,7 +1734,7 @@ parse_rx_slots(VCHIQ_STATE_T *state)
&& (service->srvstate !=
VCHIQ_SRVSTATE_FREE)) {
struct vchiq_bulk_queue *queue;
VCHIQ_BULK_T *bulk;
struct vchiq_bulk *bulk;
queue = (type == VCHIQ_MSG_BULK_RX_DONE) ?
&service->bulk_rx : &service->bulk_tx;
@ -3017,7 +3018,7 @@ VCHIQ_STATUS_T vchiq_bulk_transfer(VCHIQ_SERVICE_HANDLE_T handle,
{
VCHIQ_SERVICE_T *service = find_service_by_handle(handle);
struct vchiq_bulk_queue *queue;
VCHIQ_BULK_T *bulk;
struct vchiq_bulk *bulk;
VCHIQ_STATE_T *state;
struct bulk_waiter *bulk_waiter = NULL;
const char dir_char = (dir == VCHIQ_BULK_TRANSMIT) ? 't' : 'r';

13
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h
View File

@ -239,7 +239,7 @@ typedef enum {
typedef void (*VCHIQ_USERDATA_TERM_T)(void *userdata);
typedef struct vchiq_bulk_struct {
struct vchiq_bulk {
short mode;
short dir;
void *userdata;
@ -248,7 +248,7 @@ typedef struct vchiq_bulk_struct {
void *remote_data;
int remote_size;
int actual;
} VCHIQ_BULK_T;
};
struct vchiq_bulk_queue {
int local_insert; /* Where to insert the next local bulk */
@ -257,7 +257,7 @@ struct vchiq_bulk_queue {
int remote_notify; /* Bulk to notify the remote client of next (mstr) */
int remove; /* Bulk to notify the local client of, and remove,
** next */
VCHIQ_BULK_T bulks[VCHIQ_NUM_SERVICE_BULKS];
struct vchiq_bulk bulks[VCHIQ_NUM_SERVICE_BULKS];
};
struct remote_event {
@ -504,7 +504,7 @@ struct vchiq_state_struct {
};
struct bulk_waiter {
VCHIQ_BULK_T *bulk;
struct vchiq_bulk *bulk;
struct completion event;
int actual;
};
@ -617,10 +617,11 @@ unlock_service(VCHIQ_SERVICE_T *service);
** implementations must be provided. */
extern VCHIQ_STATUS_T
vchiq_prepare_bulk_data(VCHIQ_BULK_T *bulk, void *offset, int size, int dir);
vchiq_prepare_bulk_data(struct vchiq_bulk *bulk, void *offset, int size,
int dir);
extern void
vchiq_complete_bulk(VCHIQ_BULK_T *bulk);
vchiq_complete_bulk(struct vchiq_bulk *bulk);
extern void
remote_event_signal(struct remote_event *event);