Commit 3aaf8073 authored by Ondrej Zary's avatar Ondrej Zary Committed by Greg Kroah-Hartman

staging: ft1000-pcmcia: remove PROV_RECORD typedefs

Remove PROV_RECORD typedefs.
Signed-off-by: default avatarOndrej Zary <linux@rainbow-software.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent a8f0d231
...@@ -315,10 +315,10 @@ struct dsp_init_msg { ...@@ -315,10 +315,10 @@ struct dsp_init_msg {
u8 RfCalDate[CALDATESZ]; // Rf Calibration date u8 RfCalDate[CALDATESZ]; // Rf Calibration date
} __attribute__ ((packed)); } __attribute__ ((packed));
typedef struct _PROV_RECORD { struct prov_record {
struct list_head list; struct list_head list;
u8 *pprov_data; u8 *pprov_data;
} PROV_RECORD, *PPROV_RECORD; };
typedef struct _FT1000_INFO { typedef struct _FT1000_INFO {
struct net_device_stats stats; struct net_device_stats stats;
......
...@@ -321,7 +321,7 @@ int card_download(struct net_device *dev, const u8 *pFileStart, UINT FileLength) ...@@ -321,7 +321,7 @@ int card_download(struct net_device *dev, const u8 *pFileStart, UINT FileLength)
long word_length; long word_length;
USHORT request; USHORT request;
USHORT temp; USHORT temp;
PPROV_RECORD pprov_record; struct prov_record *pprov_record;
PUCHAR pbuffer; PUCHAR pbuffer;
PDSP_FILE_HDR_5 pFileHdr5; PDSP_FILE_HDR_5 pFileHdr5;
PDSP_IMAGE_INFO pDspImageInfo = NULL; PDSP_IMAGE_INFO pDspImageInfo = NULL;
...@@ -890,7 +890,7 @@ int card_download(struct net_device *dev, const u8 *pFileStart, UINT FileLength) ...@@ -890,7 +890,7 @@ int card_download(struct net_device *dev, const u8 *pFileStart, UINT FileLength)
sizeof(struct pseudo_hdr))); sizeof(struct pseudo_hdr)));
// link provisioning data // link provisioning data
pprov_record = pprov_record =
kmalloc(sizeof(PROV_RECORD), kmalloc(sizeof(struct prov_record),
GFP_ATOMIC); GFP_ATOMIC);
if (pprov_record) { if (pprov_record) {
pprov_record->pprov_data = pprov_record->pprov_data =
......
...@@ -421,7 +421,7 @@ static int ft1000_reset_card(struct net_device *dev) ...@@ -421,7 +421,7 @@ static int ft1000_reset_card(struct net_device *dev)
u16 tempword; u16 tempword;
int i; int i;
unsigned long flags; unsigned long flags;
PPROV_RECORD ptr; struct prov_record *ptr;
DEBUG(1, "ft1000_hw:ft1000_reset_card called.....\n"); DEBUG(1, "ft1000_hw:ft1000_reset_card called.....\n");
...@@ -436,7 +436,7 @@ static int ft1000_reset_card(struct net_device *dev) ...@@ -436,7 +436,7 @@ static int ft1000_reset_card(struct net_device *dev)
while (list_empty(&info->prov_list) == 0) { while (list_empty(&info->prov_list) == 0) {
DEBUG(0, DEBUG(0,
"ft1000_hw:ft1000_reset_card:deleting provisioning record\n"); "ft1000_hw:ft1000_reset_card:deleting provisioning record\n");
ptr = list_entry(info->prov_list.next, PROV_RECORD, list); ptr = list_entry(info->prov_list.next, struct prov_record, list);
list_del(&ptr->list); list_del(&ptr->list);
kfree(ptr->pprov_data); kfree(ptr->pprov_data);
kfree(ptr); kfree(ptr);
...@@ -1020,7 +1020,7 @@ void ft1000_proc_drvmsg(struct net_device *dev) ...@@ -1020,7 +1020,7 @@ void ft1000_proc_drvmsg(struct net_device *dev)
struct drv_msg *pdrvmsg; struct drv_msg *pdrvmsg;
u16 len; u16 len;
u16 i; u16 i;
PPROV_RECORD ptr; struct prov_record *ptr;
struct pseudo_hdr *ppseudo_hdr; struct pseudo_hdr *ppseudo_hdr;
PUSHORT pmsg; PUSHORT pmsg;
struct timeval tv; struct timeval tv;
...@@ -1061,7 +1061,7 @@ void ft1000_proc_drvmsg(struct net_device *dev) ...@@ -1061,7 +1061,7 @@ void ft1000_proc_drvmsg(struct net_device *dev)
} }
ptr = ptr =
list_entry(info->prov_list.next, list_entry(info->prov_list.next,
PROV_RECORD, list); struct prov_record, list);
len = *(u16 *) ptr->pprov_data; len = *(u16 *) ptr->pprov_data;
len = htons(len); len = htons(len);
...@@ -2095,7 +2095,7 @@ static irqreturn_t ft1000_interrupt(int irq, void *dev_id) ...@@ -2095,7 +2095,7 @@ static irqreturn_t ft1000_interrupt(int irq, void *dev_id)
void stop_ft1000_card(struct net_device *dev) void stop_ft1000_card(struct net_device *dev)
{ {
FT1000_INFO *info = netdev_priv(dev); FT1000_INFO *info = netdev_priv(dev);
PPROV_RECORD ptr; struct prov_record *ptr;
// int cnt; // int cnt;
DEBUG(0, "ft1000_hw: stop_ft1000_card()\n"); DEBUG(0, "ft1000_hw: stop_ft1000_card()\n");
...@@ -2107,7 +2107,7 @@ void stop_ft1000_card(struct net_device *dev) ...@@ -2107,7 +2107,7 @@ void stop_ft1000_card(struct net_device *dev)
// Make sure we free any memory reserve for provisioning // Make sure we free any memory reserve for provisioning
while (list_empty(&info->prov_list) == 0) { while (list_empty(&info->prov_list) == 0) {
ptr = list_entry(info->prov_list.next, PROV_RECORD, list); ptr = list_entry(info->prov_list.next, struct prov_record, list);
list_del(&ptr->list); list_del(&ptr->list);
kfree(ptr->pprov_data); kfree(ptr->pprov_data);
kfree(ptr); kfree(ptr);
......
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