staging: ft1000: Remove DRVMGS typedef usage.
authorMarek Belisko <marek.belisko@gmail.com>
Fri, 15 Oct 2010 12:13:03 +0000 (14:13 +0200)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 15 Oct 2010 19:39:26 +0000 (12:39 -0700)
Signed-off-by: Marek Belisko <marek.belisko@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/ft1000/ft1000-usb/ft1000_download.c
drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
drivers/staging/ft1000/ft1000-usb/ft1000_usb.h

index 48eb697129e2f2f19572b256016983c6a50e4edb..ee32f40b359adc5cf8a54609bbdb5a0b1928b06a 100644 (file)
@@ -786,7 +786,7 @@ u16 scram_dnldr(struct ft1000_device *ft1000dev, void *pFileStart, ULONG  FileLe
        struct dsp_image_info *pDspImageInfoV6 = NULL;
    long                    requested_version;
    BOOLEAN                 bGoodVersion;
-   PDRVMSG                 pMailBoxData;
+       struct drv_msg *pMailBoxData;
    USHORT                  *pUsData = NULL;
    USHORT                  *pUsFile = NULL;
    UCHAR                   *pUcFile = NULL;
@@ -1047,7 +1047,7 @@ u16 scram_dnldr(struct ft1000_device *ft1000dev, void *pFileStart, ULONG  FileLe
                // Convert length from byte count to word count. Make sure we round up.
                word_length = (long)(pft1000info->DSPInfoBlklen + 1)/2;
                put_request_value(ft1000dev, word_length);
-               pMailBoxData = (PDRVMSG)&(pft1000info->DSPInfoBlk[0]);
+               pMailBoxData = (struct drv_msg *)&(pft1000info->DSPInfoBlk[0]);
                /*
                 * Position ASIC DPRAM auto-increment pointer.
                 */
index 05b2a4172017bfe2a7474422f91c090b1d4fed28..1190f361d8dc19be68f0cf7b436f40e286656839 100644 (file)
@@ -2082,7 +2082,7 @@ static int ft1000_proc_drvmsg (struct ft1000_device *dev, u16 size) {
     u16 tempword;
        struct media_msg *pmediamsg;
        struct dsp_init_msg *pdspinitmsg;
-    PDRVMSG pdrvmsg;
+       struct drv_msg *pdrvmsg;
     u16 i;
        struct pseudo_hdr *ppseudo_hdr;
     PUSHORT pmsg;
@@ -2119,7 +2119,7 @@ static int ft1000_proc_drvmsg (struct ft1000_device *dev, u16 size) {
             }
         }
 #endif
-        pdrvmsg = (PDRVMSG)&cmdbuffer[2];
+       pdrvmsg = (struct drv_msg *)&cmdbuffer[2];
         msgtype = ntohs(pdrvmsg->type);
         DEBUG("ft1000_proc_drvmsg:Command message type = 0x%x\n", msgtype);
         switch (msgtype) {
index b2a70facf967f56fc7106cc1571f12678ccbdc88..4368b49f66a3580f9b44a780362dbe649027cb87 100644 (file)
@@ -455,12 +455,12 @@ struct prov_record {
 
 #define MAX_BUF_SIZE            4096
 
-typedef struct _DRVMSG {
+struct drv_msg {
        struct pseudo_hdr pseudo;
-        u16 type;
-        u16 length;
-        u8  data[0];
-} __attribute__ ((packed)) DRVMSG, *PDRVMSG;
+       u16 type;
+       u16 length;
+       u8  data[0];
+} __attribute__ ((packed));
 
 struct ft1000_device
 {