diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-20 12:40:30 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-20 12:40:30 -0700 |
| commit | b6b5244e4f1ccf838cce8499732449f26c119b88 (patch) | |
| tree | 93dc95dcfe2560cbf9ede5ed8ec85634a9926b1a /drivers/staging | |
| parent | 3c0b461e4c8fde467bd803e368d9a78ec2da5f8a (diff) | |
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>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/csr/csr_time.c | 8 | ||||
| -rw-r--r-- | drivers/staging/csr/csr_types.h | 13 |
2 files changed, 4 insertions, 17 deletions
diff --git a/drivers/staging/csr/csr_time.c b/drivers/staging/csr/csr_time.c index 1ef61e3efac6..9e5aa9002b66 100644 --- 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 76f95615033e..7018c0a708d2 100644 --- 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 |