Skip to content

Commit

Permalink
staging: csr: remove CsrUint64 and CsrInt64 typedefs.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Greg Kroah-Hartman committed Jul 20, 2012
1 parent 3c0b461 commit b6b5244
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 17 deletions.
8 changes: 4 additions & 4 deletions drivers/staging/csr/csr_time.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand All @@ -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)
{
Expand Down
13 changes: 0 additions & 13 deletions drivers/staging/csr/csr_types.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit b6b5244

Please sign in to comment.