Commit 2cbdcdc1 authored by Ondrej Zary's avatar Ondrej Zary Committed by Greg Kroah-Hartman

staging: ft1000-pcmcia: remove DSPINITMSG typedefs

Remove DSPINITMSG typedefs.
Signed-off-by: default avatarOndrej Zary <linux@rainbow-software.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent ed049d7f
...@@ -304,7 +304,7 @@ struct media_msg { ...@@ -304,7 +304,7 @@ struct media_msg {
u32 dns_2; u32 dns_2;
} __attribute__ ((packed)); } __attribute__ ((packed));
typedef struct _DSPINITMSG { struct dsp_init_msg {
struct pseudo_hdr pseudo; struct pseudo_hdr pseudo;
u16 type; u16 type;
u16 length; u16 length;
...@@ -315,7 +315,7 @@ typedef struct _DSPINITMSG { ...@@ -315,7 +315,7 @@ typedef struct _DSPINITMSG {
u8 ProductMode[MODESZ]; // Product Mode (Market/Production) u8 ProductMode[MODESZ]; // Product Mode (Market/Production)
u8 RfCalVer[CALVERSZ]; // Rf Calibration version u8 RfCalVer[CALVERSZ]; // Rf Calibration version
u8 RfCalDate[CALDATESZ]; // Rf Calibration date u8 RfCalDate[CALDATESZ]; // Rf Calibration date
} __attribute__ ((packed)) DSPINITMSG, *PDSPINITMSG; } __attribute__ ((packed));
typedef struct _DSPHIBERNATE { typedef struct _DSPHIBERNATE {
struct pseudo_hdr pseudo; struct pseudo_hdr pseudo;
......
...@@ -1016,7 +1016,7 @@ void ft1000_proc_drvmsg(struct net_device *dev) ...@@ -1016,7 +1016,7 @@ void ft1000_proc_drvmsg(struct net_device *dev)
u16 msgtype; u16 msgtype;
u16 tempword; u16 tempword;
struct media_msg *pmediamsg; struct media_msg *pmediamsg;
PDSPINITMSG pdspinitmsg; struct dsp_init_msg *pdspinitmsg;
struct drv_msg *pdrvmsg; struct drv_msg *pdrvmsg;
u16 len; u16 len;
u16 i; u16 i;
...@@ -1122,7 +1122,7 @@ void ft1000_proc_drvmsg(struct net_device *dev) ...@@ -1122,7 +1122,7 @@ void ft1000_proc_drvmsg(struct net_device *dev)
} }
break; break;
case DSP_INIT_MSG: case DSP_INIT_MSG:
pdspinitmsg = (PDSPINITMSG) & cmdbuffer[0]; pdspinitmsg = (struct dsp_init_msg *) & cmdbuffer[0];
memcpy(info->DspVer, pdspinitmsg->DspVer, DSPVERSZ); memcpy(info->DspVer, pdspinitmsg->DspVer, DSPVERSZ);
DEBUG(1, "DSPVER = 0x%2x 0x%2x 0x%2x 0x%2x\n", DEBUG(1, "DSPVER = 0x%2x 0x%2x 0x%2x 0x%2x\n",
info->DspVer[0], info->DspVer[1], info->DspVer[2], info->DspVer[0], info->DspVer[1], info->DspVer[2],
...@@ -1139,7 +1139,7 @@ void ft1000_proc_drvmsg(struct net_device *dev) ...@@ -1139,7 +1139,7 @@ void ft1000_proc_drvmsg(struct net_device *dev)
dev->dev_addr[5] = info->eui64[7]; dev->dev_addr[5] = info->eui64[7];
if (ntohs(pdspinitmsg->length) == if (ntohs(pdspinitmsg->length) ==
(sizeof(DSPINITMSG) - 20)) { (sizeof(struct dsp_init_msg) - 20)) {
memcpy(info->ProductMode, memcpy(info->ProductMode,
pdspinitmsg->ProductMode, MODESZ); pdspinitmsg->ProductMode, MODESZ);
memcpy(info->RfCalVer, pdspinitmsg->RfCalVer, memcpy(info->RfCalVer, pdspinitmsg->RfCalVer,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment