/* The following hfa384x_* structures are arguments to
  * the usercb() for the different CTLX types.
  */
-typedef struct hfa384x_rridresult {
+struct hfa384x_rridresult {
        u16 rid;
        const void *riddata;
        unsigned int riddata_len;
-} hfa384x_rridresult_t;
+};
 
 enum ctlx_state {
        CTLX_START = 0,         /* Start state, not queued */
 
 
 static void
 usbctlx_get_rridresult(const struct hfa384x_usb_rridresp *rridresp,
-                      hfa384x_rridresult_t *result);
+                      struct hfa384x_rridresult *result);
 
 /*---------------------------------------------------*/
 /* Low level req/resp CTLX formatters and submitters */
 
 static void
 usbctlx_get_rridresult(const struct hfa384x_usb_rridresp *rridresp,
-                      hfa384x_rridresult_t *result)
+                      struct hfa384x_rridresult *result)
 {
        result->rid = le16_to_cpu(rridresp->rid);
        result->riddata = rridresp->data;
 static int usbctlx_rrid_completor_fn(struct usbctlx_completor *head)
 {
        struct usbctlx_rrid_completor *complete;
-       hfa384x_rridresult_t rridresult;
+       struct hfa384x_rridresult rridresult;
 
        complete = (struct usbctlx_rrid_completor *)head;
        usbctlx_get_rridresult(complete->rridresp, &rridresult);