staging: ft1000: Remove PROV_RECORD typedef usage. (e27d96dd) · Commits · 戴 / test

drivers/staging/ft1000/ft1000-usb/ft1000_download.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -777,7 +777,6 @@ u16 scram_dnldr(struct ft1000_device ft1000dev, void pFileStart, ULONG FileLe
		USHORT handshake;
		PPSEUDO_HDR pHdr;
		USHORT usHdrLength;
		//PPROV_RECORD pProvRecord;
		long word_length;
		USHORT request;
		USHORT temp;
		@@ -801,7 +800,7 @@ u16 scram_dnldr(struct ft1000_device ft1000dev, void pFileStart, ULONG FileLe

		USHORT dpram = 0;
		PUCHAR pbuffer;
		PPROV_RECORD pprov_record;
		struct prov_record *pprov_record;
		FT1000_INFO *pft1000info = netdev_priv(ft1000dev->net);

		DEBUG("Entered scram_dnldr...\n");
		@@ -1184,7 +1183,7 @@ u16 scram_dnldr(struct ft1000_device ft1000dev, void pFileStart, ULONG FileLe
		if (pbuffer) {
		memcpy(pbuffer, (void *)pUcFile, (UINT)(usHdrLength + sizeof(PSEUDO_HDR)));
		// link provisioning data
		pprov_record = kmalloc( sizeof(PROV_RECORD), GFP_ATOMIC );
		pprov_record = kmalloc(sizeof(struct prov_record), GFP_ATOMIC);
		if (pprov_record) {
		pprov_record->pprov_data = pbuffer;
		list_add_tail (&pprov_record->list, &pft1000info->prov_list);

+4 −4

Original line number	Diff line number	Diff line
		@@ -790,7 +790,7 @@ static int ft1000_reset_card (struct net_device *dev)
		FT1000_INFO *info = netdev_priv(dev);
		struct ft1000_device *ft1000dev = info->pFt1000Dev;
		u16 tempword;
		PPROV_RECORD ptr;
		struct prov_record *ptr;

		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
		while (list_empty(&info->prov_list) == 0) {
		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);
		kfree(ptr->pprov_data);
		kfree(ptr);
		@@ -1996,7 +1996,7 @@ static int ft1000_dsp_prov(void *arg)
		u16 tempword;
		u16 len;
		u16 i=0;
		PPROV_RECORD ptr;
		struct prov_record *ptr;
		PPSEUDO_HDR ppseudo_hdr;
		PUSHORT pmsg;
		u16 status;
		@@ -2032,7 +2032,7 @@ static int ft1000_dsp_prov(void *arg)
		DEBUG("*** Provision Data Sent to DSP\n");

		// 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 = htons(len);
		len += PSEUDOSZ;

+4 −4

Original line number	Diff line number	Diff line
		@@ -90,10 +90,10 @@ struct app_info_block {
		struct list_head app_sqlist; // link list of msgs for applicaton on slow queue
		} __attribute__((packed));

		typedef struct _PROV_RECORD {
		struct prov_record {
		struct list_head list;
		u8 *pprov_data;
		} PROV_RECORD, *PPROV_RECORD;
		};

		/end of Jim/
		#define DEBUG(args...) printk(KERN_INFO args)