From patchwork Wed Sep 9 07:08:13 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Cho X-Patchwork-Id: 7144741 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 4E027BEEC1 for ; Wed, 9 Sep 2015 07:08:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7829F2083D for ; Wed, 9 Sep 2015 07:08:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7848420791 for ; Wed, 9 Sep 2015 07:08:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752986AbbIIHIP (ORCPT ); Wed, 9 Sep 2015 03:08:15 -0400 Received: from eusmtp01.atmel.com ([212.144.249.243]:51482 "EHLO eusmtp01.atmel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752410AbbIIHIO (ORCPT ); Wed, 9 Sep 2015 03:08:14 -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:08:09 +0200 From: Tony Cho To: CC: , , , , , , , , , , , Subject: [PATCH 4/4] staging: wilc1000: remove unused PLAT_RK3026_TCHIP Date: Wed, 9 Sep 2015 16:08:13 +0900 Message-ID: <1441782493-11338-4-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: Leo Kim This patch removes the preprocessor definition, PLAT_RK3026_TCHIP which is not used anymore. Signed-off-by: Leo Kim Signed-off-by: Tony Cho --- drivers/staging/wilc1000/wilc_wlan.c | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/drivers/staging/wilc1000/wilc_wlan.c b/drivers/staging/wilc1000/wilc_wlan.c index 4c54ea7..39716ba 100644 --- a/drivers/staging/wilc1000/wilc_wlan.c +++ b/drivers/staging/wilc1000/wilc_wlan.c @@ -19,9 +19,6 @@ extern wilc_hif_func_t hif_sdio; extern wilc_hif_func_t hif_spi; extern wilc_cfg_func_t mac_cfg; -#if defined(PLAT_RK3026_TCHIP) -extern u8 g_wilc_initialized; /* AMR : 0422 RK3026 Crash issue */ -#endif extern void WILC_WFI_mgmt_rx(uint8_t *buff, uint32_t size); uint32_t wilc_get_chipid(uint8_t update); u16 Set_machw_change_vir_if(bool bValue); @@ -1943,11 +1940,7 @@ uint32_t init_chip(void) uint32_t chipid; uint32_t reg, ret = 0; -#if defined(PLAT_RK3026_TCHIP) - acquire_bus(ACQUIRE_AND_WAKEUP); /* AMR : 0422 RK3026 Crash issue */ -#else acquire_bus(ACQUIRE_ONLY); -#endif chipid = wilc_get_chipid(true); @@ -2077,13 +2070,6 @@ int wilc_wlan_init(wilc_wlan_inp_t *inp, wilc_wlan_oup_t *oup) /*** * host interface init **/ -#if defined(PLAT_RK3026_TCHIP) /* AMR : 0422 RK3026 Crash issue */ - if (!g_wilc_initialized) { - custom_lock_bus(g_mac_open); - custom_wakeup(g_mac_open); - } -#endif - if ((inp->io_func.io_type & 0x1) == HIF_SDIO) { if (!hif_sdio.hif_init(inp, wilc_debug)) { /* EIO 5 */ @@ -2176,11 +2162,6 @@ int wilc_wlan_init(wilc_wlan_inp_t *inp, wilc_wlan_oup_t *oup) Init_TCP_tracking(); #endif -#if defined(PLAT_RK3026_TCHIP) /* AMR : 0422 RK3026 Crash issue */ - if (!g_wilc_initialized) - custom_unlock_bus(g_mac_open); -#endif - return 1; _fail_: @@ -2192,11 +2173,6 @@ _fail_: kfree(g_wlan.tx_buffer); g_wlan.tx_buffer = NULL; -#if defined(PLAT_RK3026_TCHIP) /* AMR : 0422 RK3026 Crash issue */ - if (!g_wilc_initialized) - custom_unlock_bus(g_mac_open); -#endif - return ret; }