staging: vc04_services: Remove VCHIQ_SLOT_ZERO_T

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>

diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
index 78ed3b0e9aa5534c49220f831de9f41215f16f6c..5b3873b7d7b9fd03450b5e7dea99337ad76c162a 100644 (file)
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
@@ -110,7 +110,7 @@ int vchiq_platform_init(struct platform_device *pdev, VCHIQ_STATE_T *state)
        struct device *dev = &pdev->dev;
        struct vchiq_drvdata *drvdata = platform_get_drvdata(pdev);
        struct rpi_firmware *fw = drvdata->fw;
-       VCHIQ_SLOT_ZERO_T *vchiq_slot_zero;
+       struct vchiq_slot_zero *vchiq_slot_zero;
        struct resource *res;
        void *slot_mem;
        dma_addr_t slot_phys;

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 ca2e96d7e411f75a091c97917991d27e04ce2d28..041d11b7fcd5877484833f7615b8ae731b5d2396 100644 (file)
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
@@ -1711,7 +1711,7 @@ parse_rx_slots(VCHIQ_STATE_T *state)
                case VCHIQ_MSG_CONNECT:
                        vchiq_log_info(vchiq_core_log_level,
                                "%d: prs CONNECT@%pK", state->id, header);
-                       state->version_common = ((VCHIQ_SLOT_ZERO_T *)
+                       state->version_common = ((struct vchiq_slot_zero *)
                                                 state->slot_data)->version;
                        complete(&state->connect);
                        break;
@@ -2101,13 +2101,13 @@ get_conn_state_name(VCHIQ_CONNSTATE_T conn_state)
        return conn_state_names[conn_state];
 }
 
-VCHIQ_SLOT_ZERO_T *
+struct vchiq_slot_zero *
 vchiq_init_slots(void *mem_base, int mem_size)
 {
        int mem_align =
                (int)((VCHIQ_SLOT_SIZE - (long)mem_base) & VCHIQ_SLOT_MASK);
-       VCHIQ_SLOT_ZERO_T *slot_zero =
-               (VCHIQ_SLOT_ZERO_T *)((char *)mem_base + mem_align);
+       struct vchiq_slot_zero *slot_zero =
+               (struct vchiq_slot_zero *)((char *)mem_base + mem_align);
        int num_slots = (mem_size - mem_align)/VCHIQ_SLOT_SIZE;
        int first_data_slot = VCHIQ_SLOT_ZERO_SLOTS;
 
@@ -2121,12 +2121,12 @@ vchiq_init_slots(void *mem_base, int mem_size)
                return NULL;
        }
 
-       memset(slot_zero, 0, sizeof(VCHIQ_SLOT_ZERO_T));
+       memset(slot_zero, 0, sizeof(struct vchiq_slot_zero));
 
        slot_zero->magic = VCHIQ_MAGIC;
        slot_zero->version = VCHIQ_VERSION;
        slot_zero->version_min = VCHIQ_VERSION_MIN;
-       slot_zero->slot_zero_size = sizeof(VCHIQ_SLOT_ZERO_T);
+       slot_zero->slot_zero_size = sizeof(struct vchiq_slot_zero);
        slot_zero->slot_size = VCHIQ_SLOT_SIZE;
        slot_zero->max_slots = VCHIQ_MAX_SLOTS;
        slot_zero->max_slots_per_side = VCHIQ_MAX_SLOTS_PER_SIDE;
@@ -2142,7 +2142,7 @@ vchiq_init_slots(void *mem_base, int mem_size)
 }
 
 VCHIQ_STATUS_T
-vchiq_init_state(VCHIQ_STATE_T *state, VCHIQ_SLOT_ZERO_T *slot_zero)
+vchiq_init_state(VCHIQ_STATE_T *state, struct vchiq_slot_zero *slot_zero)
 {
        struct vchiq_shared_state *local;
        struct vchiq_shared_state *remote;

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 0cdd66312b7866dfc4480757f32421bbce2aaea2..c319312013f71a208d6d93cadaef18ba79acf641 100644 (file)
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h
@@ -90,7 +90,7 @@ vchiq_static_assert(IS_POW2(VCHIQ_MAX_SLOTS_PER_SIDE));
 
 #define VCHIQ_SLOT_MASK        (VCHIQ_SLOT_SIZE - 1)
 #define VCHIQ_SLOT_QUEUE_MASK  (VCHIQ_MAX_SLOTS_PER_SIDE - 1)
-#define VCHIQ_SLOT_ZERO_SLOTS  ((sizeof(VCHIQ_SLOT_ZERO_T) + \
+#define VCHIQ_SLOT_ZERO_SLOTS  ((sizeof(struct vchiq_slot_zero) + \
        VCHIQ_SLOT_SIZE - 1) / VCHIQ_SLOT_SIZE)
 
 #define VCHIQ_MSG_PADDING            0  /* -                                 */
@@ -382,7 +382,7 @@ struct vchiq_shared_state {
        int debug[DEBUG_MAX];
 };
 
-typedef struct vchiq_slot_zero_struct {
+struct vchiq_slot_zero {
        int magic;
        short version;
        short version_min;
@@ -394,7 +394,7 @@ typedef struct vchiq_slot_zero_struct {
        struct vchiq_shared_state master;
        struct vchiq_shared_state slave;
        struct vchiq_slot_info slots[VCHIQ_MAX_SLOTS];
-} VCHIQ_SLOT_ZERO_T;
+};
 
 struct vchiq_state_struct {
        int id;
@@ -520,11 +520,11 @@ extern VCHIQ_STATE_T *vchiq_states[VCHIQ_MAX_STATES];
 extern const char *
 get_conn_state_name(VCHIQ_CONNSTATE_T conn_state);
 
-extern VCHIQ_SLOT_ZERO_T *
+extern struct vchiq_slot_zero *
 vchiq_init_slots(void *mem_base, int mem_size);
 
 extern VCHIQ_STATUS_T
-vchiq_init_state(VCHIQ_STATE_T *state, VCHIQ_SLOT_ZERO_T *slot_zero);
+vchiq_init_state(VCHIQ_STATE_T *state, struct vchiq_slot_zero *slot_zero);
 
 extern VCHIQ_STATUS_T
 vchiq_connect_internal(VCHIQ_STATE_T *state, VCHIQ_INSTANCE_T instance);