diff options
| author | Ondrej Zary <linux@rainbow-software.org> | 2011-07-01 00:03:35 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-07-05 10:32:31 -0700 |
| commit | 8bc0d6fb39846013a344b18d2e40d1012741ecdf (patch) | |
| tree | d6a9417980f19b27d27b1f6cdacef7e0eb5e2bfe | |
| parent | 2c9bf83922236b2994a30fcd0188d4acf0620a6a (diff) | |
staging: ft1000-pcmcia: remove DRVMSG typedefs
Remove DRVMSG typedefs.
Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/staging/ft1000/ft1000-pcmcia/ft1000.h | 4 | ||||
| -rw-r--r-- | drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c | 4 | ||||
| -rw-r--r-- | drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/drivers/staging/ft1000/ft1000-pcmcia/ft1000.h b/drivers/staging/ft1000/ft1000-pcmcia/ft1000.h index ca73aa415865..472b7371096c 100644 --- a/drivers/staging/ft1000/ft1000-pcmcia/ft1000.h +++ b/drivers/staging/ft1000/ft1000-pcmcia/ft1000.h @@ -285,12 +285,12 @@ struct pseudo_hdr #define MAXIMUM_ASIC_HB_CNT 15 -typedef struct _DRVMSG { +struct drv_msg { struct pseudo_hdr pseudo; u16 type; u16 length; u8 data[0]; -} __attribute__ ((packed)) DRVMSG, *PDRVMSG; +} __attribute__ ((packed)); typedef struct _MEDIAMSG { struct pseudo_hdr pseudo; diff --git a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c index 5633c40b9781..0a905a4299c0 100644 --- a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c +++ b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c @@ -328,7 +328,7 @@ int card_download(struct net_device *dev, const u8 *pFileStart, UINT FileLength) PDSP_IMAGE_INFO_V6 pDspImageInfoV6 = NULL; long requested_version; BOOLEAN bGoodVersion = 0; - PDRVMSG pMailBoxData; + struct drv_msg *pMailBoxData; USHORT *pUsData = NULL; USHORT *pUsFile = NULL; UCHAR *pUcFile = NULL; @@ -605,7 +605,7 @@ int card_download(struct net_device *dev, const u8 *pFileStart, UINT FileLength) (long)(info->DSPInfoBlklen + 1) / 2; put_request_value(dev, word_length); pMailBoxData = - (PDRVMSG) & info->DSPInfoBlk[0]; + (struct drv_msg *) & info->DSPInfoBlk[0]; pUsData = (USHORT *) & pMailBoxData->data[0]; // Provide mutual exclusive access while reading ASIC registers. diff --git a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c index 5f610e5ec6cb..77ce8c408e85 100644 --- a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c +++ b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c @@ -1017,7 +1017,7 @@ void ft1000_proc_drvmsg(struct net_device *dev) u16 tempword; PMEDIAMSG pmediamsg; PDSPINITMSG pdspinitmsg; - PDRVMSG pdrvmsg; + struct drv_msg *pdrvmsg; u16 len; u16 i; PPROV_RECORD ptr; @@ -1038,7 +1038,7 @@ void ft1000_proc_drvmsg(struct net_device *dev) if ( ft1000_receive_cmd(dev, &cmdbuffer[0], MAX_CMD_SQSIZE, &tempword) ) { // Get the message type which is total_len + PSEUDO header + msgtype + message body - pdrvmsg = (PDRVMSG) & cmdbuffer[0]; + pdrvmsg = (struct drv_msg *) & cmdbuffer[0]; msgtype = ntohs(pdrvmsg->type); DEBUG(1, "Command message type = 0x%x\n", msgtype); switch (msgtype) { |