From patchwork Fri Sep 11 07:52:58 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Cho X-Patchwork-Id: 7158071 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 44A999F725 for ; Fri, 11 Sep 2015 07:53:22 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7F0672084F for ; Fri, 11 Sep 2015 07:53:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9604020849 for ; Fri, 11 Sep 2015 07:53:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752010AbbIKHxT (ORCPT ); Fri, 11 Sep 2015 03:53:19 -0400 Received: from eusmtp01.atmel.com ([212.144.249.242]:37658 "EHLO eusmtp01.atmel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751997AbbIKHxS (ORCPT ); Fri, 11 Sep 2015 03:53:18 -0400 Received: from tony-itx.corp.atmel.com (10.161.101.13) by eusmtp01.atmel.com (10.161.101.30) with Microsoft SMTP Server id 14.3.235.1; Fri, 11 Sep 2015 09:53:10 +0200 From: Tony Cho To: CC: , , , , , , , , , , , Subject: [PATCH 2/7] staging: wilc1000: remove useless define PHY_802_11n Date: Fri, 11 Sep 2015 16:52:58 +0900 Message-ID: <1441957983-17726-3-git-send-email-tony.cho@atmel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1441957983-17726-1-git-send-email-tony.cho@atmel.com> References: <1441957983-17726-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 define PHY_802_11n is useless because wilc1000 support 802.11n as always. Remove PHY_802_11n and it related code. Signed-off-by: Glen Lee Signed-off-by: Tony Cho --- drivers/staging/wilc1000/coreconfigurator.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/drivers/staging/wilc1000/coreconfigurator.c b/drivers/staging/wilc1000/coreconfigurator.c index f393424..342df2a 100644 --- a/drivers/staging/wilc1000/coreconfigurator.c +++ b/drivers/staging/wilc1000/coreconfigurator.c @@ -18,7 +18,6 @@ /* Constants */ /*****************************************************************************/ #define INLINE static __inline -#define PHY_802_11n #define MAX_CFG_PKTLEN 1450 #define MSG_HEADER_LEN 4 #define QUERY_MSG_TYPE 'Q' @@ -552,7 +551,6 @@ u8 get_current_channel_802_11n(u8 *pu8msa, u16 u16RxLen) u8 get_current_channel(u8 *pu8msa, u16 u16RxLen) { -#ifdef PHY_802_11n #ifdef FIVE_GHZ_BAND /* Get the current channel as its not set in */ /* 802.11a beacons/probe response */ @@ -562,9 +560,6 @@ u8 get_current_channel(u8 *pu8msa, u16 u16RxLen) /* the beacon/probe response frame */ return get_current_channel_802_11n(pu8msa, u16RxLen); #endif /* FIVE_GHZ_BAND */ -#else - return 0; -#endif /* PHY_802_11n */ } /**