diff options
| author | Ondrej Zary <linux@rainbow-software.org> | 2011-07-01 00:03:38 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-07-05 10:32:31 -0700 |
| commit | 2cbdcdc15b85c211796ecfb92d48ee9522698fd8 (patch) | |
| tree | 97050d883ba0f59c7dae853a779f75614278e0a9 /drivers/staging/ft1000 | |
| parent | ed049d7fd4afe4fc44bc0ac259aa8dcd9c9afcca (diff) | |
staging: ft1000-pcmcia: remove DSPINITMSG typedefs
Remove DSPINITMSG typedefs.
Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/ft1000')
| -rw-r--r-- | drivers/staging/ft1000/ft1000-pcmcia/ft1000.h | 4 | ||||
| -rw-r--r-- | drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/ft1000/ft1000-pcmcia/ft1000.h b/drivers/staging/ft1000/ft1000-pcmcia/ft1000.h index 95ba8c77c9ff..f81287b49a9a 100644 --- a/drivers/staging/ft1000/ft1000-pcmcia/ft1000.h +++ b/drivers/staging/ft1000/ft1000-pcmcia/ft1000.h @@ -304,7 +304,7 @@ struct media_msg { u32 dns_2; } __attribute__ ((packed)); -typedef struct _DSPINITMSG { +struct dsp_init_msg { struct pseudo_hdr pseudo; u16 type; u16 length; @@ -315,7 +315,7 @@ typedef struct _DSPINITMSG { u8 ProductMode[MODESZ]; // Product Mode (Market/Production) u8 RfCalVer[CALVERSZ]; // Rf Calibration version u8 RfCalDate[CALDATESZ]; // Rf Calibration date -} __attribute__ ((packed)) DSPINITMSG, *PDSPINITMSG; +} __attribute__ ((packed)); typedef struct _DSPHIBERNATE { struct pseudo_hdr pseudo; diff --git a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c index ecc5319ef67d..949c15513904 100644 --- a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c +++ b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c @@ -1016,7 +1016,7 @@ void ft1000_proc_drvmsg(struct net_device *dev) u16 msgtype; u16 tempword; struct media_msg *pmediamsg; - PDSPINITMSG pdspinitmsg; + struct dsp_init_msg *pdspinitmsg; struct drv_msg *pdrvmsg; u16 len; u16 i; @@ -1122,7 +1122,7 @@ void ft1000_proc_drvmsg(struct net_device *dev) } break; case DSP_INIT_MSG: - pdspinitmsg = (PDSPINITMSG) & cmdbuffer[0]; + pdspinitmsg = (struct dsp_init_msg *) & cmdbuffer[0]; memcpy(info->DspVer, pdspinitmsg->DspVer, DSPVERSZ); DEBUG(1, "DSPVER = 0x%2x 0x%2x 0x%2x 0x%2x\n", info->DspVer[0], info->DspVer[1], info->DspVer[2], @@ -1139,7 +1139,7 @@ void ft1000_proc_drvmsg(struct net_device *dev) dev->dev_addr[5] = info->eui64[7]; if (ntohs(pdspinitmsg->length) == - (sizeof(DSPINITMSG) - 20)) { + (sizeof(struct dsp_init_msg) - 20)) { memcpy(info->ProductMode, pdspinitmsg->ProductMode, MODESZ); memcpy(info->RfCalVer, pdspinitmsg->RfCalVer, |