Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e09f138e authored by Marek Belisko's avatar Marek Belisko Committed by Greg Kroah-Hartman
Browse files

staging: ft1000: Get rid of UINT typedef usage. 



Signed-off-by: default avatarMarek Belisko <marek.belisko@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent c613f6f5

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

+3 −3
Original line number Original line Diff line number Diff line
@@ -773,7 +773,7 @@ static u32 write_blk_fifo (struct ft1000_device *ft1000dev, u16 **pUsFile, u8 ** 
u16 scram_dnldr(struct ft1000_device *ft1000dev, void *pFileStart, u32  FileLength)

u16 scram_dnldr(struct ft1000_device *ft1000dev, void *pFileStart, u32  FileLength)

{

{

   u16                     Status = STATUS_SUCCESS;

   u16                     Status = STATUS_SUCCESS;

   UINT                    uiState;

   u32                    uiState;

   u16                  handshake;

   u16                  handshake;

	struct pseudo_hdr *pHdr;

	struct pseudo_hdr *pHdr;

   u16                  usHdrLength;

   u16                  usHdrLength;
@@ -1181,14 +1181,14 @@ u16 scram_dnldr(struct ft1000_device *ft1000dev, void *pFileStart, u32 FileLeng 
            // Get buffer for provisioning data

            // Get buffer for provisioning data

		pbuffer = kmalloc((usHdrLength + sizeof(struct pseudo_hdr)), GFP_ATOMIC);

		pbuffer = kmalloc((usHdrLength + sizeof(struct pseudo_hdr)), GFP_ATOMIC);

            if (pbuffer) {

            if (pbuffer) {

		memcpy(pbuffer, (void *)pUcFile, (UINT)(usHdrLength + sizeof(struct pseudo_hdr)));

		memcpy(pbuffer, (void *)pUcFile, (u32)(usHdrLength + sizeof(struct pseudo_hdr)));

                // link provisioning data

                // link provisioning data

		pprov_record = kmalloc(sizeof(struct 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);

                    // Move to next entry if available

                    // Move to next entry if available

			pUcFile = (u8 *)((unsigned long)pUcFile + (UINT)((usHdrLength + 1) & 0xFFFFFFFE) + sizeof(struct pseudo_hdr));

			pUcFile = (u8 *)((unsigned long)pUcFile + (u32)((usHdrLength + 1) & 0xFFFFFFFE) + sizeof(struct pseudo_hdr));

                    if ( (unsigned long)(pUcFile) - (unsigned long)(pFileStart) >= (unsigned long)FileLength) {

                    if ( (unsigned long)(pUcFile) - (unsigned long)(pFileStart) >= (unsigned long)FileLength) {

                       uiState = STATE_DONE_FILE;

                       uiState = STATE_DONE_FILE;

                    }

                    }

drivers/staging/ft1000/ft1000-usb/ft1000_usb.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -98,8 +98,6 @@ struct prov_record { 
/*end of Jim*/

/*end of Jim*/

#define DEBUG(args...) printk(KERN_INFO args)

#define DEBUG(args...) printk(KERN_INFO args)





#define UINT                u32



#define FALSE           0

#define FALSE           0

#define TRUE            1

#define TRUE            1