From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 20 Jul 2012 00:51:56 +0000 (-0700)
Subject: staging: csr: oska: remove timer.c and timer.h
X-Git-Tag: v3.6-rc1~100^2~45
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bd2b57ab75be545f141f3ec5ed5cadeaff898ada;p=platform%2Fkernel%2Flinux-3.10.git

staging: csr: oska: remove timer.c and timer.h

No one is using these, remove them.

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>
---

diff --git a/drivers/staging/csr/oska/Makefile b/drivers/staging/csr/oska/Makefile
index 63ab141..02b8ef5 100644
--- a/drivers/staging/csr/oska/Makefile
+++ b/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/drivers/staging/csr/oska/timer.c b/drivers/staging/csr/oska/timer.c
deleted file mode 100644
index 67d3423..0000000
--- a/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/drivers/staging/csr/oska/timer.h b/drivers/staging/csr/oska/timer.h
deleted file mode 100644
index 3045fc3..0000000
--- a/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 */