u16 crc;
 } __packed;
 
-typedef struct hfa384x_pdrec {
+struct hfa384x_pdrec {
        u16 len;                /* in words */
        u16 code;
        union pdr {
                struct hfa384x_pdr_end_of_pda end_of_pda;
 
        } data;
-} __packed hfa384x_pdrec_t;
+} __packed;
 
 #ifdef __KERNEL__
 /*--------------------------------------------------------------------
 
 
 struct pda {
        u8 buf[HFA384x_PDA_LEN_MAX];
-       hfa384x_pdrec_t *rec[HFA384x_PDA_RECS_MAX];
+       struct hfa384x_pdrec *rec[HFA384x_PDA_RECS_MAX];
        unsigned int nrec;
 };
 
 
        /* clear the pda and add an initial END record */
        memset(&pda, 0, sizeof(pda));
-       pda.rec[0] = (hfa384x_pdrec_t *)pda.buf;
+       pda.rec[0] = (struct hfa384x_pdrec *)pda.buf;
        pda.rec[0]->len = cpu_to_le16(2);       /* len in words */
        pda.rec[0]->code = cpu_to_le16(HFA384x_PDR_END_OF_PDA);
        pda.nrec = 1;
        curroff = 0;
        while (curroff < (HFA384x_PDA_LEN_MAX / 2 - 1) &&
               le16_to_cpu(pda16[curroff + 1]) != HFA384x_PDR_END_OF_PDA) {
-               pda->rec[pda->nrec] = (hfa384x_pdrec_t *)&(pda16[curroff]);
+               pda->rec[pda->nrec] = (struct hfa384x_pdrec *)&(pda16[curroff]);
 
                if (le16_to_cpu(pda->rec[pda->nrec]->code) ==
                    HFA384x_PDR_NICID) {
                       curroff, pda->nrec);
                return 1;
        }
-       pda->rec[pda->nrec] = (hfa384x_pdrec_t *)&(pda16[curroff]);
+       pda->rec[pda->nrec] = (struct hfa384x_pdrec *)&(pda16[curroff]);
        (pda->nrec)++;
        return 0;
 }