Commit db03f1d2 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

staging: csr: remove oska submodule 



Turns out nothing in this module was being used at all, so instead of
deleting it piece by piece, just remove the whole thing.  I don't know
why it was added in the first place.

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: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bd2b57ab

drivers/staging/csr/Makefile

+0 −2
Original line number Diff line number Diff line 
obj-$(CONFIG_CSR_WIFI)	+= oska/



ccflags-y	:= -DCSR_SME_USERSPACE -DCSR_SUPPORT_SME -DREMOTE_SYS_SAP -DCSR_WIFI_SECURITY_WAPI_ENABLE -DENABLE_SHUTDOWN -DUNIFI_DEBUG

ccflags-y	+= -DSDIO_EXPORTS_STRUCT_DEVICE -DCSR_WIFI_SUPPORT_MMC_DRIVER -DCSR_WIFI_SINGLE_FUNCTION -DCSR_WIFI_SPLIT_PATCH

ccflags-y	+= -DCSR_SUPPORT_WEXT -DREMOTE_SYS_SAP  -DREMOTE_MGT_SAP -DCSR_WIFI_SECURITY_WAPI_ENABLE -DCSR_WIFI_SECURITY_WAPI_QOSCTRL_MIC_WORKAROUND -DENABLE_SHUTDOWN -DCSR_WIFI_NME_ENABLE -DCSR_WIFI_AP_ENABLE -DCSR_SUPPORT_WEXT_AP -DCSR_WIFI_REQUEUE_PACKET_TO_HAL

drivers/staging/csr/oska/Makefile

deleted100644 → 0
+0 −7
Original line number Diff line number Diff line 
obj-$(CONFIG_CSR_WIFI) := csr_oska.o



csr_oska-y := \

       event.o \

       oska_module.o \

       thread.o

drivers/staging/csr/oska/alloc.h

deleted100644 → 0
+0 −41
Original line number Diff line number Diff line 
/*

 * OSKA Linux implementation -- memory allocation

 *

 * Copyright (C) 2007 Cambridge Silicon Radio Ltd.

 *

 * Refer to LICENSE.txt included with this source code for details on

 * the license terms.

 */

#ifndef __OSKA_LINUX_ALLOC_H

#define __OSKA_LINUX_ALLOC_H



#include <linux/kernel.h>

#include <linux/slab.h>

#include <linux/vmalloc.h>



static inline void *os_alloc(size_t size)

{

    return kzalloc(size, GFP_ATOMIC);

}



static inline void *os_alloc_nonzeroed(size_t size)

{

    return kmalloc(size, GFP_KERNEL);

}



static inline void os_free(void *ptr)

{

    kfree(ptr);

}



static inline void *os_alloc_big(size_t size)

{

    return vmalloc(size);

}



static inline void os_free_big(void *ptr)

{

    vfree(ptr);

}



#endif /* #ifndef __OSKA_LINUX_ALLOC_H */

drivers/staging/csr/oska/event.c

deleted100644 → 0
+0 −82
Original line number Diff line number Diff line 
/*

 * Linux event functions.

 *

 * Copyright (C) 2009 Cambridge Silicon Radio Ltd.

 *

 * Refer to LICENSE.txt included with this source code for details on

 * the license terms.

 */

#include <linux/module.h>

#include <linux/sched.h>



#include "event.h"



void os_event_init(os_event_t *evt)

{

    init_waitqueue_head(&evt->wq);

    spin_lock_init(&evt->lock);

    evt->events = 0;

}

EXPORT_SYMBOL(os_event_init);



uint16_t os_event_wait(os_event_t *evt)

{

    uint16_t e;

    unsigned long flags;



    wait_event(evt->wq, evt->events != 0);



    spin_lock_irqsave(&evt->lock, flags);

    e = evt->events;

    evt->events &= ~e;

    spin_unlock_irqrestore(&evt->lock, flags);



    return e;

}

EXPORT_SYMBOL(os_event_wait);



uint16_t os_event_wait_interruptible(os_event_t *evt)

{

    uint16_t e;

    unsigned long flags;



    wait_event_interruptible(evt->wq, evt->events != 0);



    spin_lock_irqsave(&evt->lock, flags);

    e = evt->events;

    evt->events &= ~e;

    spin_unlock_irqrestore(&evt->lock, flags);



    return e;

}

EXPORT_SYMBOL(os_event_wait_interruptible);



uint16_t os_event_wait_timed(os_event_t *evt, unsigned timeout_ms)

{

    uint16_t e;

    unsigned long flags;



    wait_event_interruptible_timeout(evt->wq,

                                     evt->events != 0,

                                     msecs_to_jiffies(timeout_ms));



    spin_lock_irqsave(&evt->lock, flags);

    e = evt->events;

    evt->events &= ~e;

    spin_unlock_irqrestore(&evt->lock, flags);



    return e;

}

EXPORT_SYMBOL(os_event_wait_timed);



void os_event_raise(os_event_t *evt, uint16_t events)

{

    unsigned long flags;



    spin_lock_irqsave(&evt->lock, flags);

    evt->events |= events;

    spin_unlock_irqrestore(&evt->lock, flags);



    wake_up(&evt->wq);

}

EXPORT_SYMBOL(os_event_raise);

drivers/staging/csr/oska/event.h

deleted100644 → 0
+0 −33
Original line number Diff line number Diff line 
/*

 * OSKA Linux implementation -- events

 *

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

#define __OSKA_LINUX_EVENT_H



#include <linux/kernel.h>

#include <linux/wait.h>

#include <linux/spinlock.h>



typedef struct {

    wait_queue_head_t wq;

    spinlock_t lock;

    uint16_t events;

} os_event_t;



void os_event_init(os_event_t *evt);



static inline void os_event_destroy(os_event_t *evt)

{

}



uint16_t os_event_wait(os_event_t *evt);

uint16_t os_event_wait_interruptible(os_event_t *evt);

uint16_t os_event_wait_timed(os_event_t *evt, unsigned timeout_ms);

void os_event_raise(os_event_t *evt, uint16_t events);



#endif /* #ifndef __OSKA_LINUX_EVENT_H */