From: Marek Belisko <marek.belisko@gmail.com>
Date: Fri, 15 Oct 2010 12:13:03 +0000 (+0200)
Subject: staging: ft1000: Remove DRVMGS typedef usage.
X-Git-Tag: v2.6.37-rc1~60^2~3^2~83
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e09aee2a525218c428109cd16f871585e696b1f3;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

staging: ft1000: Remove DRVMGS typedef usage.

Signed-off-by: Marek Belisko <marek.belisko@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_download.c b/drivers/staging/ft1000/ft1000-usb/ft1000_download.c
index 48eb697..ee32f40 100644
--- a/drivers/staging/ft1000/ft1000-usb/ft1000_download.c
+++ b/drivers/staging/ft1000/ft1000-usb/ft1000_download.c
@@ -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.
                 */
diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c b/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
index 05b2a41..1190f36 100644
--- a/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
+++ b/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
@@ -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) {
diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h b/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
index b2a70fa..4368b49 100644
--- a/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
+++ b/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
@@ -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
 {