lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

staging: ft1000-pcmcia: remove DSPINITMSG typedefs

Browse Source 
Remove DSPINITMSG typedefs.

Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Ondrej Zary 2011-07-01 00:03:38 +02:00 committed by Greg Kroah-Hartman
parent ed049d7fd4
commit 2cbdcdc15b
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/ft1000/ft1000-pcmcia/ft1000.h
View File

@ -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;

6
drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
View File

@ -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,