From 9f47550adbe8e3496b88c54400c58986b27f33da Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 19 Jul 2012 17:42:52 -0700
Subject: [PATCH] staging: csr: oska: remove all.h and types.h
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

No one is using these (with one minor exception that was fixed in
list.c) so remove the header files.

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>
---
 drivers/staging/csr/oska/all.h   | 60 ----------------------------------------
 drivers/staging/csr/oska/list.c  |  4 ---
 drivers/staging/csr/oska/types.h | 14 ----------
 3 files changed, 78 deletions(-)
 delete mode 100644 drivers/staging/csr/oska/all.h
 delete mode 100644 drivers/staging/csr/oska/types.h

diff --git a/drivers/staging/csr/oska/all.h b/drivers/staging/csr/oska/all.h
deleted file mode 100644
index b08bc1f..0000000
--- a/drivers/staging/csr/oska/all.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Operating system kernel abstraction -- all functions
- *
- * Copyright (C) 2007 Cambridge Silicon Radio Ltd.
- *
- * Refer to LICENSE.txt included with this source code for details on
- * the license terms.
- */
-#ifndef __OSKA_ALL_H
-#define __OSKA_ALL_H
-
-/**
- * @mainpage Operating System Kernel Abstraction
- *
- * @section intro Introduction
- *
- * The Operating System Kernel Abstraction (oska) is a software
- * package providing an abstraction for various operating system
- * kernel facilities for use by device drivers and other OS kernel
- * software (e.g., SDIO stacks).  Oska is modularized and intended to
- * be a lightweight wrapper around an OSes interfaces.
- *
- * @section modules Modules
- *
- * Oska is organized into the modules, each of which has it's own
- * header file providing the interface.
- *
- *   - \ref alloc "Memory allocation" <oska/alloc.h>
- *   - \ref event "Events" <oska/event.h>
- *   - \ref mutex "Mutexes" <oska/mutex.h>
- *   - \ref print "Console output" <oska/print.h>
- *   - \ref spinlock "Spinlocks" <oska/spinlock.h>
- *   - \ref thread "Threading" <oska/thread.h>
- *   - \ref time "Timing and delays" <oska/time.h>
- *   - \ref timer "Timers" <oska/timer.h>
- *   - \ref types "Standard Types" <oska/types.h>
- *   - \ref util "Miscellaneous utilities" <oska/util.h>
- *
- * An <oska/all.h> header is provided which includes all the above
- * modules.
- *
- * There are additional modules that are not included in <oska/all.h>.
- *
- *   - \ref refcount "Reference Counting" <oska/refcount.h>
- *   - \ref list "Linked lists" <oska/list.h>
- *   - \ref trace "Tracing messages" <oska/trace.h>
- */
-
-#include "alloc.h"
-#include "event.h"
-#include "mutex.h"
-#include "print.h"
-#include "spinlock.h"
-#include "thread.h"
-#include "time.h"
-#include "timer.h"
-#include "types.h"
-#include "util.h"
-
-#endif /* __OSKA_ALL_H */
diff --git a/drivers/staging/csr/oska/list.c b/drivers/staging/csr/oska/list.c
index b5e884e..7d26c4a 100644
--- a/drivers/staging/csr/oska/list.c
+++ b/drivers/staging/csr/oska/list.c
@@ -8,9 +8,7 @@
  */
 
 #include <stddef.h>
-
 #include "list.h"
-#include "util.h"
 
 /**
  * Initialize an empty list.
@@ -37,8 +35,6 @@ int os_list_empty(struct os_list *list)
 static void os_list_add(struct os_list_node *prev, struct os_list_node *new,
                         struct os_list_node *next)
 {
-    OS_ASSERT(new->next == NULL && new->prev == NULL);
-
     next->prev = new;
     new->next  = next;
     new->prev  = prev;
diff --git a/drivers/staging/csr/oska/types.h b/drivers/staging/csr/oska/types.h
deleted file mode 100644
index 18d7c11..0000000
--- a/drivers/staging/csr/oska/types.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * OSKA Linux implementation -- types
- *
- * 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_TYPES_H
-#define __OSKA_LINUX_TYPES_H
-
-#include <linux/types.h>
-
-#endif /* #ifndef __OSKA_LINUX_TYPES_H */
-- 
2.7.4