Typedefing structs is not encouraged in the kernel.
The removal of typedefs was requested in interface/vchi/TODO in commit
7626e002225a4c1b9455689b1f22909dfeff43ca.
Signed-off-by: Dominic Braun <inf.braun@xxxxxx>
Signed-off-by: Tobias Büttner <tobias.buettner@xxxxxx>
---
.../vc04_services/interface/vchiq_arm/vchiq_core.c | 11 ++++++-----
.../vc04_services/interface/vchiq_arm/vchiq_core.h | 10 +++++-----
2 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
index 17da7fd3bdd8..74c4d7db0780 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
@@ -1148,13 +1148,13 @@ queue_message_sync(VCHIQ_STATE_T *state, struct vchiq_service_struct *service,
}
static inline void
-claim_slot(VCHIQ_SLOT_INFO_T *slot)
+claim_slot(struct vchiq_slot_info_struct *slot)
{
slot->use_count++;
}
static void
-release_slot(VCHIQ_STATE_T *state, VCHIQ_SLOT_INFO_T *slot_info,
+release_slot(VCHIQ_STATE_T *state, struct vchiq_slot_info_struct *slot_info,
struct vchiq_header_struct *header,
struct vchiq_service_struct *service)
{
@@ -2515,7 +2515,7 @@ release_service_messages(struct vchiq_service_struct *service)
}
for (i = state->remote->slot_first; i <= slot_last; i++) {
- VCHIQ_SLOT_INFO_T *slot_info =
+ struct vchiq_slot_info_struct *slot_info =
SLOT_INFO_FROM_INDEX(state, i);
if (slot_info->release_count != slot_info->use_count) {
char *data =
@@ -3260,7 +3260,7 @@ vchiq_release_message(VCHIQ_SERVICE_HANDLE_T handle,
int msgid = header->msgid;
if (msgid & VCHIQ_MSGID_CLAIMED) {
- VCHIQ_SLOT_INFO_T *slot_info =
+ struct vchiq_slot_info_struct *slot_info =
SLOT_INFO_FROM_INDEX(state, slot_index);
release_slot(state, slot_info, header, service);
@@ -3416,7 +3416,8 @@ vchiq_dump_shared_state(void *dump_context, VCHIQ_STATE_T *state,
vchiq_dump(dump_context, buf, len + 1);
for (i = shared->slot_first; i <= shared->slot_last; i++) {
- VCHIQ_SLOT_INFO_T slot_info = *SLOT_INFO_FROM_INDEX(state, i);
+ struct vchiq_slot_info_struct slot_info =
+ *SLOT_INFO_FROM_INDEX(state, i);
if (slot_info.use_count != slot_info.release_count) {
len = snprintf(buf, sizeof(buf),
" %d: %d/%d", i, slot_info.use_count,
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h
index 533bb8d49d4f..135ea648979a 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h
@@ -274,11 +274,11 @@ typedef struct vchiq_slot_struct {
char data[VCHIQ_SLOT_SIZE];
} VCHIQ_SLOT_T;
-typedef struct vchiq_slot_info_struct {
+struct vchiq_slot_info_struct {
/* Use two counters rather than one to avoid the need for a mutex. */
short use_count;
short release_count;
-} VCHIQ_SLOT_INFO_T;
+};
struct vchiq_service_struct {
struct vchiq_service_base_struct base;
@@ -393,7 +393,7 @@ typedef struct vchiq_slot_zero_struct {
int platform_data[2];
struct vchiq_shared_state_struct master;
struct vchiq_shared_state_struct slave;
- VCHIQ_SLOT_INFO_T slots[VCHIQ_MAX_SLOTS];
+ struct vchiq_slot_info_struct slots[VCHIQ_MAX_SLOTS];
} VCHIQ_SLOT_ZERO_T;
struct vchiq_state_struct {
@@ -439,7 +439,7 @@ struct vchiq_state_struct {
char *tx_data;
char *rx_data;
- VCHIQ_SLOT_INFO_T *rx_info;
+ struct vchiq_slot_info_struct *rx_info;
struct mutex slot_mutex;
@@ -498,7 +498,7 @@ struct vchiq_state_struct {
struct vchiq_service_struct *services[VCHIQ_MAX_SERVICES];
struct vchiq_service_quota_struct service_quotas[VCHIQ_MAX_SERVICES];
- VCHIQ_SLOT_INFO_T slot_info[VCHIQ_MAX_SLOTS];
+ struct vchiq_slot_info_struct slot_info[VCHIQ_MAX_SLOTS];
VCHIQ_PLATFORM_STATE_T platform_state;
};
--
2.17.1
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
