From d9bf6d30995db515b7af8a7116af07883b50f80d 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] --- yaml --- r: 318139 b: refs/heads/master c:
 9f47550adbe8e3496b88c54400c58986b27f33da h: refs/heads/master i:   318137:
 c37b2b684970f68e835329d776e4df22a9dd2b0f   318135:
 22df31437665d730961620d44cb0de6db56c9e69 v: v3

---
 [refs]                                 |  2 +-
 trunk/drivers/staging/csr/oska/all.h   | 60 --------------------------
 trunk/drivers/staging/csr/oska/list.c  |  4 --
 trunk/drivers/staging/csr/oska/types.h | 14 ------
 4 files changed, 1 insertion(+), 79 deletions(-)
 delete mode 100644 trunk/drivers/staging/csr/oska/all.h
 delete mode 100644 trunk/drivers/staging/csr/oska/types.h

diff --git a/[refs] b/[refs]
index c4e1edd4ca3b..5a3975acaeac 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 44bb4ac4bf6b3ac751dadce46367a05ff965376e
+refs/heads/master: 9f47550adbe8e3496b88c54400c58986b27f33da
diff --git a/trunk/drivers/staging/csr/oska/all.h b/trunk/drivers/staging/csr/oska/all.h
deleted file mode 100644
index b08bc1fc21cd..000000000000
--- a/trunk/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/trunk/drivers/staging/csr/oska/list.c b/trunk/drivers/staging/csr/oska/list.c
index b5e884e1f201..7d26c4a69c08 100644
--- a/trunk/drivers/staging/csr/oska/list.c
+++ b/trunk/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/trunk/drivers/staging/csr/oska/types.h b/trunk/drivers/staging/csr/oska/types.h
deleted file mode 100644
index 18d7c111e74a..000000000000
--- a/trunk/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 */