---

yaml --- r: 318183 b: refs/heads/master c: 4becf12 h: refs/heads/master i: 318181: ab4a713 318179: e90bdb9 318175: 27e4f68 v: v3
git-mirror · Jul 20, 2012 · 9132f87 · 9132f87
1 parent 10be047
commit 9132f87
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 54 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7de2c5b6ae9c99e7b4213c06ed5264c24d943a35
+refs/heads/master: 4becf12de1a4efefd28e057750e35f4ceb32dd1d
diff --git a/trunk/drivers/staging/csr/csr_framework_ext.c b/trunk/drivers/staging/csr/csr_framework_ext.c
@@ -146,21 +146,3 @@ void CsrThreadSleep(u16 sleepTimeInMs)
     schedule_timeout_uninterruptible(t);
 }
 EXPORT_SYMBOL_GPL(CsrThreadSleep);
-
-/*----------------------------------------------------------------------------*
- *  NAME
- *      CsrMemAllocDma
- *
- *  DESCRIPTION
- *      Allocate DMA capable dynamic memory of a given size.
- *
- *  RETURNS
- *      Pointer to allocated memory, or NULL in case of failure.
- *      Allocated memory is not initialised.
- *
- *----------------------------------------------------------------------------*/
-void *CsrMemAllocDma(size_t size)
-{
-    return kmalloc(size, GFP_KERNEL | GFP_DMA);
-}
-EXPORT_SYMBOL_GPL(CsrMemAllocDma);
diff --git a/trunk/drivers/staging/csr/csr_framework_ext.h b/trunk/drivers/staging/csr/csr_framework_ext.h
@@ -241,37 +241,6 @@ CsrResult CsrThreadEqual(CsrThreadHandle *threadHandle1, CsrThreadHandle *thread
  *----------------------------------------------------------------------------*/
 void CsrThreadSleep(u16 sleepTimeInMs);
 
-#ifndef CSR_PMEM_DEBUG_ENABLE
-/*----------------------------------------------------------------------------*
- *  NAME
- *      CsrMemAllocDma
- *
- *  DESCRIPTION
- *      Allocate dynamic memory suitable for DMA transfers.
- *
- *  RETURNS
- *      Pointer to allocated memory, or NULL in case of failure.
- *      Allocated memory is not initialised.
- *
- *----------------------------------------------------------------------------*/
-#ifdef CSR_MEM_DEBUG
-void *CsrMemAllocDmaDebug(size_t size,
-    const char *file, u32 line);
-#define CsrMemAllocDma(sz) CsrMemAllocDmaDebug((sz), __FILE__, __LINE__)
-#else
-void *CsrMemAllocDma(size_t size);
-#endif
-
-
-#else
-
-#include "csr_pmem.h"
-
-#define CsrMemAllocDma(size) CsrPmemDebugAlloc(size, CSR_PMEM_DEBUG_TYPE_MEM_ALLOC_DMA, __FILE__, __LINE__)
-
-#endif
-
-
 #ifdef __cplusplus
 }
 #endif

diff --git a/trunk/drivers/staging/csr/csr_wifi_hip_card_sdio.c b/trunk/drivers/staging/csr/csr_wifi_hip_card_sdio.c
@@ -1630,7 +1630,7 @@ static CsrResult card_allocate_memory_resources(card_t *card)
     /*
      * Allocate memory for the from-host and to-host signal buffers.
      */
-    card->fh_buffer.buf = CsrMemAllocDma(UNIFI_FH_BUF_SIZE);
+    card->fh_buffer.buf = kmalloc(UNIFI_FH_BUF_SIZE, GFP_KERNEL);
     if (card->fh_buffer.buf == NULL)
     {
         unifi_error(card->ospriv, "Failed to allocate memory for F-H signals\n");
@@ -1641,7 +1641,7 @@ static CsrResult card_allocate_memory_resources(card_t *card)
     card->fh_buffer.ptr = card->fh_buffer.buf;
     card->fh_buffer.count = 0;
 
-    card->th_buffer.buf = CsrMemAllocDma(UNIFI_FH_BUF_SIZE);
+    card->th_buffer.buf = kmalloc(UNIFI_FH_BUF_SIZE, GFP_KERNEL);
     if (card->th_buffer.buf == NULL)
     {
         unifi_error(card->ospriv, "Failed to allocate memory for T-H signals\n");

diff --git a/trunk/drivers/staging/csr/csr_wifi_hip_card_sdio_intr.c b/trunk/drivers/staging/csr/csr_wifi_hip_card_sdio_intr.c
@@ -1758,7 +1758,7 @@ static CsrResult process_bulk_data_command(card_t *card, const u8 *cmdptr,
 
     if (len != 0 && (dir == UNIFI_SDIO_WRITE) && (((ptrdiff_t)bdslot->os_data_ptr + offset) & 3))
     {
-        host_bulk_data_slot = CsrMemAllocDma(len);
+        host_bulk_data_slot = kmalloc(len, GFP_KERNEL);
 
         if (!host_bulk_data_slot)
         {

diff --git a/trunk/drivers/staging/csr/csr_wifi_hip_download.c b/trunk/drivers/staging/csr/csr_wifi_hip_download.c
@@ -675,7 +675,7 @@ static CsrResult send_ptdl_to_unifi(card_t *card, void *dlpriv,
         return CSR_WIFI_HIP_RESULT_INVALID_VALUE;
     }
 
-    buf = CsrMemAllocDma(buf_size);
+    buf = kmalloc(buf_size, GFP_KERNEL);
     if (buf == NULL)
     {
         unifi_error(card->ospriv, "Failed to allocate transfer buffer for firmware download\n");