staging: csr: remove CsrUint64 and CsrInt64 typedefs.

CsrInt64 wasn't being used, and CsrUint64 was only used in one place, so
replace that with u64.

Cc: Mikko Virkkilä <mikko.virkkila@bluegiga.com>
Cc: Lauri Hintsala <Lauri.Hintsala@bluegiga.com>
Cc: Riku Mettälä <riku.mettala@bluegiga.com>
Cc: Veli-Pekka Peltola <veli-pekka.peltola@bluegiga.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/csr/csr_time.c b/drivers/staging/csr/csr_time.c
index 1ef61e3efac6ffdcbe90131db26e60625b2118af..9e5aa9002b6640a02907dfbf36bb878591fd4e62 100644 (file)
--- a/drivers/staging/csr/csr_time.c
+++ b/drivers/staging/csr/csr_time.c
@@ -26,11 +26,11 @@
 CsrTime CsrTimeGet(CsrTime *high)
 {
     struct timespec ts;
-    CsrUint64 time;
+    u64 time;
     CsrTime low;
 
     ts = current_kernel_time();
-    time = (CsrUint64) ts.tv_sec * 1000000 + ts.tv_nsec / 1000;
+    time = (u64) ts.tv_sec * 1000000 + ts.tv_nsec / 1000;
 
     if (high != NULL)
     {
@@ -46,10 +46,10 @@ EXPORT_SYMBOL_GPL(CsrTimeGet);
 void CsrTimeUtcGet(CsrTimeUtc *tod, CsrTime *low, CsrTime *high)
 {
     struct timespec ts;
-    CsrUint64 time;
+    u64 time;
 
     ts = current_kernel_time();
-    time = (CsrUint64) ts.tv_sec * 1000000 + ts.tv_nsec / 1000;
+    time = (u64) ts.tv_sec * 1000000 + ts.tv_nsec / 1000;
 
     if (high != NULL)
     {

diff --git a/drivers/staging/csr/csr_types.h b/drivers/staging/csr/csr_types.h
index 76f95615033ecdad52fafd0f7e0226b1f07b1a0b..7018c0a708d21e6f6966b40b6f7cc806e9a87066 100644 (file)
--- a/drivers/staging/csr/csr_types.h
+++ b/drivers/staging/csr/csr_types.h
@@ -26,19 +26,6 @@ extern "C" {
 #undef  TRUE
 #define TRUE (1)
 
-/*
- * 64-bit integers
- *
- * Note: If a given compiler does not support 64-bit types, it is
- * OK to omit these definitions;  32-bit versions of the code using
- * these types may be available.  Consult the relevant documentation
- * or the customer support group for information on this.
- */
-#define CSR_HAVE_64_BIT_INTEGERS
-typedef uint64_t CsrUint64;
-typedef int64_t CsrInt64;
-
-
 #ifdef __cplusplus
 }
 #endif