aboutsummaryrefslogtreecommitdiff
path: root/drivers/staging/csr
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-07-19 17:51:56 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-07-19 17:51:56 -0700
commitbd2b57ab75be545f141f3ec5ed5cadeaff898ada (patch)
treee0a31100420af29733b6fbe44ba42d380aeca06d /drivers/staging/csr
parent3421ee2f84488e9c03fb7ddfcd60bc30796678c8 (diff)
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>
Diffstat (limited to 'drivers/staging/csr')
-rw-r--r--drivers/staging/csr/oska/Makefile3
-rw-r--r--drivers/staging/csr/oska/timer.c28
-rw-r--r--drivers/staging/csr/oska/timer.h40
3 files changed, 1 insertions, 70 deletions
diff --git a/drivers/staging/csr/oska/Makefile b/drivers/staging/csr/oska/Makefile
index 63ab141853c6..02b8ef54da86 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 67d3423315f5..000000000000
--- 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 3045fc3b98b7..000000000000
--- 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 */