From 5f29ab232e691740e2cd07be1cae875ddc45e236 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 19 Jul 2012 17:51:56 -0700
Subject: [PATCH] --- yaml --- r: 318143 b: refs/heads/master c:
 bd2b57ab75be545f141f3ec5ed5cadeaff898ada h: refs/heads/master i:   318141:
 333144b6220e29df9c2e4689ffe6bc17132f6c4a   318139:
 d9bf6d30995db515b7af8a7116af07883b50f80d   318135:
 22df31437665d730961620d44cb0de6db56c9e69   318127:
 88c0c8e25683d7cae54fa281168562c0f66f1ca1   318111:
 7b11dd6918a88992c12b06089a43b812d0fdb2b7   318079:
 2136ee3bb05dd03d9f9baaf5bca75539fcae3bbf v: v3

---
 [refs]                                  |  2 +-
 trunk/drivers/staging/csr/oska/Makefile |  3 +-
 trunk/drivers/staging/csr/oska/timer.c  | 28 -----------------
 trunk/drivers/staging/csr/oska/timer.h  | 40 -------------------------
 4 files changed, 2 insertions(+), 71 deletions(-)
 delete mode 100644 trunk/drivers/staging/csr/oska/timer.c
 delete mode 100644 trunk/drivers/staging/csr/oska/timer.h

diff --git a/[refs] b/[refs]
index 3b012c9fce91..dec10f4146fc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3421ee2f84488e9c03fb7ddfcd60bc30796678c8
+refs/heads/master: bd2b57ab75be545f141f3ec5ed5cadeaff898ada
diff --git a/trunk/drivers/staging/csr/oska/Makefile b/trunk/drivers/staging/csr/oska/Makefile
index 63ab141853c6..02b8ef54da86 100644
--- a/trunk/drivers/staging/csr/oska/Makefile
+++ b/trunk/drivers/staging/csr/oska/Makefile
@@ -3,6 +3,5 @@ obj-$(CONFIG_CSR_WIFI) := csr_oska.o
 csr_oska-y := \
        event.o \
        oska_module.o \
-       thread.o \
-       timer.o
+       thread.o
 
diff --git a/trunk/drivers/staging/csr/oska/timer.c b/trunk/drivers/staging/csr/oska/timer.c
deleted file mode 100644
index 67d3423315f5..000000000000
--- a/trunk/drivers/staging/csr/oska/timer.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * OSKA Linux implementation -- timers.
- *
- * Copyright (C) 2007 Cambridge Silicon Radio Ltd.
- *
- * Refer to LICENSE.txt included with this source code for details on
- * the license terms.
- */
-#include <linux/module.h>
-
-#include "timer.h"
-
-static void timer_func(unsigned long data)
-{
-    os_timer_t *timer = (os_timer_t *)data;
-
-    timer->func(timer->arg);
-}
-
-void os_timer_init(os_timer_t *timer, os_timer_func_t func, void *arg)
-{
-    timer->func = func;
-    timer->arg = arg;
-    timer->timer.function = timer_func;
-    timer->timer.data = (unsigned long)timer;
-    init_timer(&timer->timer);
-}
-EXPORT_SYMBOL(os_timer_init);
diff --git a/trunk/drivers/staging/csr/oska/timer.h b/trunk/drivers/staging/csr/oska/timer.h
deleted file mode 100644
index 3045fc3b98b7..000000000000
--- a/trunk/drivers/staging/csr/oska/timer.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * OSKA Linux implementation -- timers.
- *
- * Copyright (C) 2009 Cambridge Silicon Radio Ltd.
- *
- * Refer to LICENSE.txt included with this source code for details on
- * the license terms.
- */
-#ifndef __OSKA_LINUX_TIMER_H
-#define __OSKA_LINUX_TIMER_H
-
-#include <linux/kernel.h>
-#include <linux/timer.h>
-
-typedef void (*os_timer_func_t)(void *arg);
-
-typedef struct {
-    os_timer_func_t func;
-    void *arg;
-    struct timer_list timer;
-} os_timer_t;
-
-void os_timer_init(os_timer_t *timer, os_timer_func_t func, void *arg);
-
-static inline void os_timer_destroy(os_timer_t *timer)
-{
-    del_timer_sync(&timer->timer);
-}
-
-static inline void os_timer_set(os_timer_t *timer, unsigned long expires_ms)
-{
-    mod_timer(&timer->timer, jiffies + msecs_to_jiffies(expires_ms));
-}
-
-static inline void os_timer_cancel(os_timer_t *timer)
-{
-    del_timer(&timer->timer);
-}
-
-#endif /* #ifndef __OSKA_LINUX_TIMER_H */