From patchwork Wed Sep 9 07:08:11 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Cho X-Patchwork-Id: 7144721 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 5391B9F314 for ; Wed, 9 Sep 2015 07:08:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6A1F22078D for ; Wed, 9 Sep 2015 07:08:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 56F9C2074E for ; Wed, 9 Sep 2015 07:08:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752253AbbIIHIB (ORCPT ); Wed, 9 Sep 2015 03:08:01 -0400 Received: from eusmtp01.atmel.com ([212.144.249.243]:51426 "EHLO eusmtp01.atmel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751082AbbIIHIA (ORCPT ); Wed, 9 Sep 2015 03:08:00 -0400 Received: from tony-itx.corp.atmel.com (10.161.101.13) by eusmtp01.atmel.com (10.161.101.31) with Microsoft SMTP Server id 14.3.235.1; Wed, 9 Sep 2015 09:07:55 +0200 From: Tony Cho To: CC: , , , , , , , , , , , Subject: [PATCH 2/4] staging: wilc1000: delete wilc_memory.c and wilc_memory.h Date: Wed, 9 Sep 2015 16:08:11 +0900 Message-ID: <1441782493-11338-2-git-send-email-tony.cho@atmel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1441782493-11338-1-git-send-email-tony.cho@atmel.com> References: <1441782493-11338-1-git-send-email-tony.cho@atmel.com> MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Glen Lee The macro WILC_MALLOC is not used in the driver anymore, so just delete files. Signed-off-by: Glen Lee Signed-off-by: Tony Cho --- drivers/staging/wilc1000/Makefile | 2 +- drivers/staging/wilc1000/wilc_memory.c | 16 -------- drivers/staging/wilc1000/wilc_memory.h | 66 ------------------------------- drivers/staging/wilc1000/wilc_msgqueue.h | 1 - drivers/staging/wilc1000/wilc_oswrapper.h | 4 -- 5 files changed, 1 insertion(+), 88 deletions(-) delete mode 100644 drivers/staging/wilc1000/wilc_memory.c delete mode 100644 drivers/staging/wilc1000/wilc_memory.h diff --git a/drivers/staging/wilc1000/Makefile b/drivers/staging/wilc1000/Makefile index 8336a89..bdeffea 100644 --- a/drivers/staging/wilc1000/Makefile +++ b/drivers/staging/wilc1000/Makefile @@ -21,7 +21,7 @@ ccflags-$(CONFIG_WILC1000_DYNAMICALLY_ALLOCATE_MEMROY) += -DWILC_NORMAL_ALLOC wilc1000-objs := wilc_wfi_cfgoperations.o linux_wlan.o linux_mon.o \ - wilc_memory.o wilc_msgqueue.o \ + wilc_msgqueue.o \ coreconfigurator.o host_interface.o \ wilc_sdio.o wilc_spi.o wilc_wlan_cfg.o wilc_debugfs.o diff --git a/drivers/staging/wilc1000/wilc_memory.c b/drivers/staging/wilc1000/wilc_memory.c deleted file mode 100644 index e90a957..0000000 --- a/drivers/staging/wilc1000/wilc_memory.c +++ /dev/null @@ -1,16 +0,0 @@ - -#include "wilc_memory.h" - -/*! - * @author syounan - * @date 18 Aug 2010 - * @version 1.0 - */ -void *WILC_MemoryAlloc(u32 u32Size, tstrWILC_MemoryAttrs *strAttrs, - char *pcFileName, u32 u32LineNo) -{ - if (u32Size > 0) - return kmalloc(u32Size, GFP_ATOMIC); - else - return NULL; -} diff --git a/drivers/staging/wilc1000/wilc_memory.h b/drivers/staging/wilc1000/wilc_memory.h deleted file mode 100644 index f19cec1..0000000 --- a/drivers/staging/wilc1000/wilc_memory.h +++ /dev/null @@ -1,66 +0,0 @@ -#ifndef __WILC_MEMORY_H__ -#define __WILC_MEMORY_H__ - -/*! - * @file wilc_memory.h - * @brief Memory OS wrapper functionality - * @author syounan - * @sa wilc_oswrapper.h top level OS wrapper file - * @date 16 Aug 2010 - * @version 1.0 - */ - -#include -#include - -/*! - * @struct tstrWILC_MemoryAttrs - * @brief Memory API options - * @author syounan - * @date 16 Aug 2010 - * @version 1.0 - */ -typedef struct { -} tstrWILC_MemoryAttrs; - -/*! - * @brief Allocates a given size of bytes - * @param[in] u32Size size of memory in bytes to be allocated - * @param[in] strAttrs Optional attributes, NULL for default - * if not NULL, pAllocationPool should point to the pool to use for - * this allocation. if NULL memory will be allocated directly from - * the system - * @param[in] pcFileName file name of the calling code for debugging - * @param[in] u32LineNo line number of the calling code for debugging - * @return The new allocated block, NULL if allocation fails - * @note It is recommended to use of of the wrapper macros instead of - * calling this function directly - * @sa sttrWILC_MemoryAttrs - * @sa WILC_MALLOC - * @sa WILC_MALLOC_EX - * @author syounan - * @date 16 Aug 2010 - * @version 1.0 - */ -void *WILC_MemoryAlloc(u32 u32Size, tstrWILC_MemoryAttrs *strAttrs, - char *pcFileName, u32 u32LineNo); - -/*! - * @brief standrad malloc wrapper with custom attributes - */ - #define WILC_MALLOC_EX(__size__, __attrs__) \ - (WILC_MemoryAlloc( \ - (__size__), __attrs__, NULL, 0)) - - -/*! - * @brief standrad malloc wrapper with default attributes - */ -#define WILC_MALLOC(__size__) \ - WILC_MALLOC_EX(__size__, NULL) - - - - - -#endif diff --git a/drivers/staging/wilc1000/wilc_msgqueue.h b/drivers/staging/wilc1000/wilc_msgqueue.h index fc65dfe..fb26463 100644 --- a/drivers/staging/wilc1000/wilc_msgqueue.h +++ b/drivers/staging/wilc1000/wilc_msgqueue.h @@ -12,7 +12,6 @@ #include "wilc_platform.h" #include "wilc_errorsupport.h" -#include "wilc_memory.h" /*! * @brief Creates a new Message queue diff --git a/drivers/staging/wilc1000/wilc_oswrapper.h b/drivers/staging/wilc1000/wilc_oswrapper.h index cb48325..68f6efe 100644 --- a/drivers/staging/wilc1000/wilc_oswrapper.h +++ b/drivers/staging/wilc1000/wilc_oswrapper.h @@ -19,10 +19,6 @@ /* Error reporting and handling support */ #include "wilc_errorsupport.h" -/* Memory support */ -#include "wilc_memory.h" - - /* Message Queue */ #include "wilc_msgqueue.h"