From: Marek Belisko <marek.belisko@gmail.com>
To: Greg Kroah-Hartman <gregkh@suse.de>,
Marek Belisko <marek.belisko@gmail.com>
Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org,
Marek Belisko <marek.belisko@gmail.com>
Subject: [PATCH 9/9] staging: ft1000: Get rid of UINT typedef usage.
Date: Wed, 3 Nov 2010 11:19:55 +0100 [thread overview]
Message-ID: <1288779595-15793-9-git-send-email-marek.belisko@gmail.com> (raw)
In-Reply-To: <1288779595-15793-1-git-send-email-marek.belisko@gmail.com>
Signed-off-by: Marek Belisko <marek.belisko@gmail.com>
---
.../staging/ft1000/ft1000-usb/ft1000_download.c | 6 +++---
drivers/staging/ft1000/ft1000-usb/ft1000_usb.h | 2 --
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_download.c b/drivers/staging/ft1000/ft1000-usb/ft1000_download.c
index 235eb45..e90eb63 100644
--- a/drivers/staging/ft1000/ft1000-usb/ft1000_download.c
+++ b/drivers/staging/ft1000/ft1000-usb/ft1000_download.c
@@ -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 Status = STATUS_SUCCESS;
- UINT uiState;
+ u32 uiState;
u16 handshake;
struct pseudo_hdr *pHdr;
u16 usHdrLength;
@@ -1181,14 +1181,14 @@ u16 scram_dnldr(struct ft1000_device *ft1000dev, void *pFileStart, u32 FileLeng
// Get buffer for provisioning data
pbuffer = kmalloc((usHdrLength + sizeof(struct pseudo_hdr)), GFP_ATOMIC);
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
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);
// 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) {
uiState = STATE_DONE_FILE;
}
diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h b/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
index 340e845..4aa78b5 100644
--- a/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
+++ b/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
@@ -98,8 +98,6 @@ struct prov_record {
/*end of Jim*/
#define DEBUG(args...) printk(KERN_INFO args)
-#define UINT u32
-
#define FALSE 0
#define TRUE 1
--
1.7.1
prev parent reply other threads:[~2010-11-03 10:18 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-03 10:19 [PATCH 1/9] staging: ft1000: Get rid of PUCHAR typedef Marek Belisko
2010-11-03 10:19 ` [PATCH 2/9] staging: ft1000: Get rid of UCHAR typedef Marek Belisko
2010-11-03 10:19 ` [PATCH 3/9] staging: ft1000: GEt rid of PUSHORT typedef usage Marek Belisko
2010-11-03 10:19 ` [PATCH 4/9] staging: ft1000: Get rid of USHORT " Marek Belisko
2010-11-03 10:19 ` [PATCH 5/9] staging: ft1000: Get rid of PULONG " Marek Belisko
2010-11-03 10:19 ` [PATCH 6/9] staging: ft1000: Get rid of ULONG " Marek Belisko
2010-11-03 10:19 ` [PATCH 7/9] staging: ft1000: Get rid of BOOLEAN " Marek Belisko
2010-11-03 14:57 ` Brandon Philips
2010-11-04 6:58 ` Belisko Marek
2010-11-03 10:19 ` [PATCH 8/9] staging: ft1000: Get rid of PCHAR " Marek Belisko
2010-11-03 10:19 ` Marek Belisko [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1288779595-15793-9-git-send-email-marek.belisko@gmail.com \
--to=marek.belisko@gmail.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@suse.de \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®