From patchwork Sat Oct 10 12:41:54 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanislav Kholmanskikh X-Patchwork-Id: 7366231 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id C7230BEEA4 for ; Sat, 10 Oct 2015 12:42:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 06288208FA for ; Sat, 10 Oct 2015 12:42:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1B02C208F8 for ; Sat, 10 Oct 2015 12:42:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752075AbbJJMmF (ORCPT ); Sat, 10 Oct 2015 08:42:05 -0400 Received: from mail-lb0-f177.google.com ([209.85.217.177]:33366 "EHLO mail-lb0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751994AbbJJMmB (ORCPT ); Sat, 10 Oct 2015 08:42:01 -0400 Received: by lbos8 with SMTP id s8so104274248lbo.0; Sat, 10 Oct 2015 05:41:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=opM83gQkhm0kdWXsflvf6Uyc9jbSe3CEjMD7t8CrQ94=; b=njL8uFMX6L13V8OCdEB+kTuJxNlYEqudWDwItjpSgz7Bjomzg3RXfALbuD7wR5CbY+ Nh5zZBcaF38Is/6Kz7CwtHYp6zu4+2RRDQAXWXVa6WsM97wv+hq9SynWYg1TuDtbFUSJ vH8c8wLMSy7DOvGHW+Rdp2DOEupfM+37b03+OdVzU2sXZ99WS0Fq23tR0/dHUaUxZ9Zv ZtbEPcguhEQ1cnlp45Cm22/A1h1FlMcbDxZfsKmCTlFwP/dHPHnQgeV/D7e4tnN+1Zr4 39m/rJTKyN7ZUFJaMJypg1yMoA9WL/Zh9KR8HD2MdJlx4DqyWRXrcK6Xz6rzdq3EP8a4 2JvA== X-Received: by 10.112.198.97 with SMTP id jb1mr8882634lbc.8.1444480919453; Sat, 10 Oct 2015 05:41:59 -0700 (PDT) Received: from localhost.localdomain ([93.92.200.170]) by smtp.googlemail.com with ESMTPSA id b193sm1143928lfb.46.2015.10.10.05.41.58 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 10 Oct 2015 05:41:58 -0700 (PDT) From: Stanislav Kholmanskikh To: dan.carpenter@oracle.com, johnny.kim@atmel.com, rachel.kim@atmel.com, chris.park@atmel.com, tony.cho@atmel.com, glen.lee@atmel.com, leo.kim@atmel.com, gregkh@linuxfoundation.org Cc: linux-wireless@vger.kernel.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, Stanislav Kholmanskikh Subject: [PATCH] staging: wilc1000: remove WILC1000_DYNAMICALLY_ALLOCATE_MEMROY Date: Sat, 10 Oct 2015 15:41:54 +0300 Message-Id: <1444480914-20269-1-git-send-email-kholmanskikh.s.s@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <20151009182326.GV7340@mwanda> References: <20151009182326.GV7340@mwanda> 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.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, 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 The config option in the subject may be removed, because, indeed, it only serves as the 'n' value for CONFIG_WILC1000_PREALLOCATE_AT_LOADING_DRIVER Signed-off-by: Stanislav Kholmanskikh --- drivers/staging/wilc1000/Kconfig | 15 ++------------- drivers/staging/wilc1000/Makefile | 3 --- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/drivers/staging/wilc1000/Kconfig b/drivers/staging/wilc1000/Kconfig index 59ccecc..2701a01 100644 --- a/drivers/staging/wilc1000/Kconfig +++ b/drivers/staging/wilc1000/Kconfig @@ -6,27 +6,16 @@ config WILC1000 ---help--- This module only support IEEE 802.11n WiFi. -choice - prompt "Memory Allocation" - depends on WILC1000 - default WILC1000_PREALLOCATE_AT_LOADING_DRIVER - config WILC1000_PREALLOCATE_AT_LOADING_DRIVER bool "Preallocate memory at loading driver" + depends on WILC1000 + default y ---help--- This choice supports static allocation of the memory for the receive buffer. The driver will allocate the RX buffer during initial time. The driver will also free the buffer by calling network device stop. -config WILC1000_DYNAMICALLY_ALLOCATE_MEMROY - bool "Dynamically allocate memory in real time" - ---help--- - This choice supports dynamic allocation of the memory - for the receive buffer. The driver will allocate the RX buffer - when it is required. -endchoice - choice prompt "Bus Type" depends on WILC1000 diff --git a/drivers/staging/wilc1000/Makefile b/drivers/staging/wilc1000/Makefile index f495061..eb8f51d 100644 --- a/drivers/staging/wilc1000/Makefile +++ b/drivers/staging/wilc1000/Makefile @@ -15,9 +15,6 @@ ccflags-y += -I$(src)/ -D__CHECK_ENDIAN__ -DWILC_ASIC_A0 \ ccflags-$(CONFIG_WILC1000_PREALLOCATE_AT_LOADING_DRIVER) += -DMEMORY_STATIC \ -DWILC_PREALLOC_AT_INSMOD -ccflags-$(CONFIG_WILC1000_DYNAMICALLY_ALLOCATE_MEMROY) += -DWILC_NORMAL_ALLOC - - wilc1000-objs := wilc_wfi_cfgoperations.o linux_wlan.o linux_mon.o \ wilc_msgqueue.o \ coreconfigurator.o host_interface.o \