From 5c49121296012ac1157b24a9be0a6a88cc2eebd5 Mon Sep 17 00:00:00 2001 From: Devendra Naga Date: Sat, 21 Jul 2012 13:05:32 +0545 Subject: [PATCH] --- yaml --- r: 324469 b: refs/heads/master c: 02c4be05d9718d5d0f45db39cbef8a927ff4ebb8 h: refs/heads/master i: 324467: ef0abefdb176e03bbd713ed08622db6beb4b8e9c v: v3 --- [refs] | 2 +- trunk/drivers/staging/csr/csr_time.c | 20 +++++++++----------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/[refs] b/[refs] index e3d714348486..be14ed500387 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8c4a12718df3bf67c86d6d372564ab688cbfe7a3 +refs/heads/master: 02c4be05d9718d5d0f45db39cbef8a927ff4ebb8 diff --git a/trunk/drivers/staging/csr/csr_time.c b/trunk/drivers/staging/csr/csr_time.c index 83586ca34e8c..2043f253ae4c 100644 --- a/trunk/drivers/staging/csr/csr_time.c +++ b/trunk/drivers/staging/csr/csr_time.c @@ -24,20 +24,18 @@ CsrTime CsrTimeGet(CsrTime *high) { - struct timespec ts; - u64 time; - CsrTime low; + struct timespec ts; + u64 time; + CsrTime low; - ts = current_kernel_time(); - time = (u64) ts.tv_sec * 1000000 + ts.tv_nsec / 1000; + ts = current_kernel_time(); + time = (u64) ts.tv_sec * 1000000 + ts.tv_nsec / 1000; - if (high != NULL) - { - *high = (CsrTime) ((time >> 32) & 0xFFFFFFFF); - } + if (high != NULL) + *high = (CsrTime) ((time >> 32) & 0xFFFFFFFF); - low = (CsrTime) (time & 0xFFFFFFFF); + low = (CsrTime) (time & 0xFFFFFFFF); - return low; + return low; } EXPORT_SYMBOL_GPL(CsrTimeGet);