From e09aee2a525218c428109cd16f871585e696b1f3 Mon Sep 17 00:00:00 2001 From: Marek Belisko Date: Fri, 15 Oct 2010 14:13:03 +0200 Subject: [PATCH] staging: ft1000: Remove DRVMGS typedef usage. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman --- drivers/staging/ft1000/ft1000-usb/ft1000_download.c | 4 ++-- drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 4 ++-- drivers/staging/ft1000/ft1000-usb/ft1000_usb.h | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_download.c b/drivers/staging/ft1000/ft1000-usb/ft1000_download.c index 48eb697129e2..ee32f40b359a 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 05b2a4172017..1190f361d8dc 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 b2a70facf967..4368b49f66a3 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 { -- 2.39.5