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>

diff --git a/drivers/staging/ft1000/ft1000-pcmcia/ft1000.h b/drivers/staging/ft1000/ft1000-pcmcia/ft1000.h
index ca73aa415865ec14875922944081ea93b854ce33..472b7371096c38fde760f39d46662ad7de3cf679 100644 (file)
--- 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 5633c40b9781920254d82abd9c403770d04f4a81..0a905a4299c0340f37b6cf2fb4b8073de1881c8e 100644 (file)
--- 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 5f610e5ec6cb6cf130602a95f2675445e99b595d..77ce8c408e859b20b840ad067eca5da62fbedee5 100644 (file)
--- 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) {