summaryrefslogtreecommitdiff
path: root/drivers/staging/csr/sme_sys.c
diff options
context:
space:
mode:
authorDevendra Naga <devendra.aaru@gmail.com>2012-10-24 06:33:57 (GMT)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-10-24 22:23:09 (GMT)
commitaad3d31fdf925277997641197c2f0eabf728e177 (patch)
treec8a261ddaa6bdd288f08238ce88904a177c44da1 /drivers/staging/csr/sme_sys.c
parentcf7d9b4231e5d505084e1438192b27ad6b82dd00 (diff)
downloadlinux-fsl-qoriq-aad3d31fdf925277997641197c2f0eabf728e177.tar.xz
staging: csr: remove the CsrTime typedef altogether
remove CsrTime typedef and replace all the users with the u32 Signed-off-by: Devendra Naga <devendra.aaru@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/csr/sme_sys.c')
-rw-r--r--drivers/staging/csr/sme_sys.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/csr/sme_sys.c b/drivers/staging/csr/sme_sys.c
index 90a30dc..9c5ca3a 100644
--- a/drivers/staging/csr/sme_sys.c
+++ b/drivers/staging/csr/sme_sys.c
@@ -2101,7 +2101,7 @@ static int peer_add_new_record(unifi_priv_t *priv,CsrWifiRouterCtrlPeerAddReq *r
u8 freeSlotFound = FALSE;
CsrWifiRouterCtrlStaInfo_t *newRecord = NULL;
netInterface_priv_t *interfacePriv = priv->interfacePriv[req->interfaceTag];
- CsrTime currentTime, currentTimeHi;
+ u32 currentTime, currentTimeHi;
unsigned long lock_flags;
if (req->interfaceTag >= CSR_WIFI_NUM_INTERFACES) {
@@ -2295,8 +2295,8 @@ static void check_inactivity_timer_expire_func(unsigned long data)
struct unifi_priv *priv;
CsrWifiRouterCtrlStaInfo_t *sta_record = NULL;
u8 i = 0;
- CsrTime now;
- CsrTime inactive_time;
+ u32 now;
+ u32 inactive_time;
netInterface_priv_t *interfacePriv = (netInterface_priv_t *) data;
if (!interfacePriv)
@@ -2328,11 +2328,11 @@ static void check_inactivity_timer_expire_func(unsigned long data)
if (sta_record->lastActivity > now)
{
/* simple timer wrap (for 1 wrap) */
- inactive_time = CsrTimeAdd((CsrTime)CsrTimeSub(CSR_SCHED_TIME_MAX, sta_record->lastActivity), now);
+ inactive_time = CsrTimeAdd((u32)CsrTimeSub(CSR_SCHED_TIME_MAX, sta_record->lastActivity), now);
}
else
{
- inactive_time = (CsrTime)CsrTimeSub(now, sta_record->lastActivity);
+ inactive_time = (u32)CsrTimeSub(now, sta_record->lastActivity);
}
if (inactive_time >= STA_INACTIVE_TIMEOUT_VAL)