evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: ft1000: Remove PROV_RECORD typedef usage.

Browse source 
Signed-off-by: Marek Belisko <marek.belisko@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Marek Belisko 2010-10-15 14:13:01 +02:00 • committed by Greg Kroah-Hartman
parent 151adba757
commit e27d96dd9c
3 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/staging/ft1000/ft1000-usb/ft1000_download.c
View file

@ -777,7 +777,6 @@ u16 scram_dnldr(struct ft1000_device *ft1000dev, void *pFileStart, ULONG FileLe
USHORT handshake; USHORT handshake;
PPSEUDO_HDR pHdr; PPSEUDO_HDR pHdr;
USHORT usHdrLength; USHORT usHdrLength;
//PPROV_RECORD pProvRecord;
long word_length; long word_length;
USHORT request; USHORT request;
USHORT temp; USHORT temp;
@ -801,7 +800,7 @@ u16 scram_dnldr(struct ft1000_device *ft1000dev, void *pFileStart, ULONG FileLe
USHORT dpram = 0; USHORT dpram = 0;
PUCHAR pbuffer; PUCHAR pbuffer;
PPROV_RECORD pprov_record; struct prov_record *pprov_record;
FT1000_INFO *pft1000info = netdev_priv(ft1000dev->net); FT1000_INFO *pft1000info = netdev_priv(ft1000dev->net);
DEBUG("Entered scram_dnldr...\n"); DEBUG("Entered scram_dnldr...\n");
@ -1184,7 +1183,7 @@ u16 scram_dnldr(struct ft1000_device *ft1000dev, void *pFileStart, ULONG FileLe
if (pbuffer) { if (pbuffer) {
memcpy(pbuffer, (void *)pUcFile, (UINT)(usHdrLength + sizeof(PSEUDO_HDR))); memcpy(pbuffer, (void *)pUcFile, (UINT)(usHdrLength + sizeof(PSEUDO_HDR)));
// link provisioning data // link provisioning data
pprov_record = kmalloc( sizeof(PROV_RECORD), GFP_ATOMIC ); pprov_record = kmalloc(sizeof(struct prov_record), GFP_ATOMIC);
if (pprov_record) { if (pprov_record) {
pprov_record->pprov_data = pbuffer; pprov_record->pprov_data = pbuffer;
list_add_tail (&pprov_record->list, &pft1000info->prov_list); list_add_tail (&pprov_record->list, &pft1000info->prov_list);

8
drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
View file

@ -790,7 +790,7 @@ static int ft1000_reset_card (struct net_device *dev)
FT1000_INFO *info = netdev_priv(dev); FT1000_INFO *info = netdev_priv(dev);
struct ft1000_device *ft1000dev = info->pFt1000Dev; struct ft1000_device *ft1000dev = info->pFt1000Dev;
u16 tempword; u16 tempword;
PPROV_RECORD ptr; struct prov_record *ptr;
DEBUG("ft1000_hw:ft1000_reset_card called.....\n"); DEBUG("ft1000_hw:ft1000_reset_card called.....\n");
@ -802,7 +802,7 @@ static int ft1000_reset_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) {
DEBUG("ft1000_hw:ft1000_reset_card:deleting provisioning record\n"); DEBUG("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);
@ -1996,7 +1996,7 @@ static int ft1000_dsp_prov(void *arg)
u16 tempword; u16 tempword;
u16 len; u16 len;
u16 i=0; u16 i=0;
PPROV_RECORD ptr; struct prov_record *ptr;
PPSEUDO_HDR ppseudo_hdr; PPSEUDO_HDR ppseudo_hdr;
PUSHORT pmsg; PUSHORT pmsg;
u16 status; u16 status;
@ -2032,7 +2032,7 @@ static int ft1000_dsp_prov(void *arg)
DEBUG("*** Provision Data Sent to DSP\n"); DEBUG("*** Provision Data Sent to DSP\n");
// Send provisioning data // Send provisioning data
ptr = list_entry(info->prov_list.next, PROV_RECORD, list); ptr = list_entry(info->prov_list.next, struct prov_record, list);
len = *(u16 *)ptr->pprov_data; len = *(u16 *)ptr->pprov_data;
len = htons(len); len = htons(len);
len += PSEUDOSZ; len += PSEUDOSZ;

8
drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
View file

@ -90,10 +90,10 @@ struct app_info_block {
struct list_head app_sqlist; // link list of msgs for applicaton on slow queue struct list_head app_sqlist; // link list of msgs for applicaton on slow queue
} __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; };
/*end of Jim*/ /*end of Jim*/
#define DEBUG(args...) printk(KERN_INFO args) #define DEBUG(args...) printk(KERN_INFO args)