[PATCH 26/34] staging: bcm: Convert typedef ULONG64 to unsigned long long

Joe Perches joe at perches.com
Tue Jan 10 16:54:20 UTC 2012


Use the normal types.
Remove the now unused typedef.

Signed-off-by: Joe Perches <joe at perches.com>
---
 drivers/staging/bcm/HostMIBSInterface.h |    4 ++--
 drivers/staging/bcm/Ioctl.h             |    2 +-
 drivers/staging/bcm/Typedefs.h          |    1 -
 drivers/staging/bcm/led_control.c       |    6 +++---
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/drivers/staging/bcm/HostMIBSInterface.h b/drivers/staging/bcm/HostMIBSInterface.h
index 35d1e63..217e45d 100644
--- a/drivers/staging/bcm/HostMIBSInterface.h
+++ b/drivers/staging/bcm/HostMIBSInterface.h
@@ -50,8 +50,8 @@ typedef union _U_MIBS_IP_ADDRESS {
 
 
 typedef struct _S_MIBS_HOST_INFO {
-	ULONG64			GoodTransmits;
-	ULONG64			GoodReceives;
+	unsigned long long	GoodTransmits;
+	unsigned long long	GoodReceives;
 	// this to keep track of the Tx and Rx MailBox Registers.
 	unsigned long	NumDesUsed;
 	unsigned long	CurrNumFreeDesc;
diff --git a/drivers/staging/bcm/Ioctl.h b/drivers/staging/bcm/Ioctl.h
index 5a8f4f5..47f9334 100644
--- a/drivers/staging/bcm/Ioctl.h
+++ b/drivers/staging/bcm/Ioctl.h
@@ -324,7 +324,7 @@ typedef struct _FLASH2X_BITMAP {
 
 //for net entry time check
 typedef struct _ST_TIME_ELAPSED_ {
-	ULONG64	ul64TimeElapsedSinceNetEntry;
+	unsigned long long	ul64TimeElapsedSinceNetEntry;
 	UINT32   uiReserved[4]; //By chance if required for future proofing
 }ST_TIME_ELAPSED,*PST_TIME_ELAPSED;
 
diff --git a/drivers/staging/bcm/Typedefs.h b/drivers/staging/bcm/Typedefs.h
index bd7dafc..07e73e8 100644
--- a/drivers/staging/bcm/Typedefs.h
+++ b/drivers/staging/bcm/Typedefs.h
@@ -16,7 +16,6 @@ typedef unsigned short B_UINT16;
 typedef unsigned int B_UINT32;
 typedef unsigned long DWORD;
 
-typedef unsigned long long ULONG64;
 typedef unsigned long long LARGE_INTEGER;
 typedef unsigned int UINT32;
 #ifndef NULL
diff --git a/drivers/staging/bcm/led_control.c b/drivers/staging/bcm/led_control.c
index 0722cf5..f9a8426 100644
--- a/drivers/staging/bcm/led_control.c
+++ b/drivers/staging/bcm/led_control.c
@@ -99,11 +99,11 @@ static int LED_Proportional_Blink(PMINI_ADAPTER Adapter, unsigned char GPIO_Num_
 				  LedEventInfo_t currdriverstate)
 {
 	/* Initial values of TX and RX packets */
-	ULONG64 Initial_num_of_packts_tx = 0, Initial_num_of_packts_rx = 0;
+	unsigned long long Initial_num_of_packts_tx = 0, Initial_num_of_packts_rx = 0;
 	/* values of TX and RX packets after 1 sec */
-	ULONG64 Final_num_of_packts_tx = 0, Final_num_of_packts_rx = 0;
+	unsigned long long Final_num_of_packts_tx = 0, Final_num_of_packts_rx = 0;
 	/* Rate of transfer of Tx and Rx in 1 sec */
-	ULONG64 rate_of_transfer_tx = 0, rate_of_transfer_rx = 0;
+	unsigned long long rate_of_transfer_tx = 0, rate_of_transfer_rx = 0;
 	int Status = STATUS_SUCCESS;
 	int num_of_time = 0, num_of_time_tx = 0, num_of_time_rx = 0;
 	unsigned int remDelay = 0;
-- 
1.7.8.111.gad25c.dirty




More information about the devel mailing list