From patchwork Mon Nov 16 14:05:07 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 7627641 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 7FC5EBF90C for ; Mon, 16 Nov 2015 14:14:14 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0C6EB2054A for ; Mon, 16 Nov 2015 14:14:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1954A20528 for ; Mon, 16 Nov 2015 14:14:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753028AbbKPOJk (ORCPT ); Mon, 16 Nov 2015 09:09:40 -0500 Received: from mout.kundenserver.de ([212.227.126.130]:51592 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751931AbbKPOF3 (ORCPT ); Mon, 16 Nov 2015 09:05:29 -0500 Received: from wuerfel.lan. ([134.3.118.24]) by mrelayeu.kundenserver.de (mreue004) with ESMTPSA (Nemesis) id 0MgJWc-1ZmjJK0pEc-00NfzZ; Mon, 16 Nov 2015 15:05:24 +0100 From: Arnd Bergmann To: Greg Kroah-Hartman Cc: Johnny Kim , Austin Shin , Chris Park , Tony Cho , Glen Lee , Leo Kim , linux-wireless@vger.kernel.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, Arnd Bergmann Subject: [PATCH 16/19] staging/wilc1000: remove WILC_SDIO/WILC_SPI macros Date: Mon, 16 Nov 2015 15:05:07 +0100 Message-Id: <1447682710-2908925-17-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.1.0.rc2 In-Reply-To: <1447682710-2908925-1-git-send-email-arnd@arndb.de> References: <1447682710-2908925-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:XHbs89HYHQqZhtm1sQp+GjHKvbeawJPLUmNADI7CvSWTv/NbOS8 dSWgF+/jE9dtEgtk4FwLdVyyYGx3iYcWVkBqKBXblWrBR7a0CunAUGsRPUVdH1KjlxGzuKr RLbezwYOh7YYGA4JLU11rGpsERMYSTv8+bKb8osZ4h8MbIyseR7PGVRkHVL0LJkM7uE4+aN UYmP0N9yYcCtmFw4w1ADQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:Lu0lO0AfuR4=:hrn5DtZmhhkbR5l7+XiO92 jukDaL8mhaS1TMxEKibGZvBGX/dtalJq9MPydTtBuESIjpeC9P33J5XBRL1h2L45O1/ehy1vx wZEoy5EuOi4x7sTfOFTJXmFpcA24RAn+ej/H6qlX4wHXrGep+SdXEsygBKjRBOjjKTLiw44oY 5yiF18lZjSCIKzRgwOIY9cnXKWBhp5AaQwuB61R1HhmXVpHrVeKYLdA4X5/QbkIOL1GIWOufX aRG4Cif2SRmEzXE98heQi6aNeI4mEKZG/mFSBlI9vPtjw97/4Pnu4qTlP76aJbbojvxKDyS5i jTpFyeMqVihqeb//wNVG9RCOjfPCW8mh+Y0p9gSrOJIlsHBH6Zdr0+NoWggpNY/eMsqk6N9BX S/Abxoa/cC9D+9L4Fl9Kv1SavriL8QgnwFQfP9tHqCBLBSkLe0KoCoXO6TP4Y1M/CauMStkhr q7Im/fdLTL1Kys/F+ELN2EHuIAnUCmPiNvYg+IgrXc88si75nSyW5Jl4nkCuapErsSSmx3XGl HfkvX6Mc9Ine7XilS4XOg7oEjZKwPegL/3kpiwmTpfveLczxKIlClJm5mNNWqC9YpDsqfBB62 Sm89kjzVFYQZonDvrfo1QFx3MTo+yjba0P8kg1H2WDqF4MsLMQxpqtJa6xCcPUAP6/NKSvO53 mjGJ+foR/+nfE8Vbarz/jE4NVjVDkred4kW1RgD6eCyzRSvB2m9I1aluJMbXdJumTYR0= Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-7.7 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 last remaining user of WILC_SDIO macro checks for the correct time to wait in an interrupt for the PLL to settle. We can replace this with a runtime check and remove both WILC_SDIO and WILC_SPI, as we no longer need conditional compilation based on the hardware type. Signed-off-by: Arnd Bergmann --- drivers/staging/wilc1000/Makefile | 3 +-- drivers/staging/wilc1000/wilc_wlan.c | 5 ++++- drivers/staging/wilc1000/wilc_wlan.h | 7 ++----- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/drivers/staging/wilc1000/Makefile b/drivers/staging/wilc1000/Makefile index fe480c76c521..dcba27bd3bce 100644 --- a/drivers/staging/wilc1000/Makefile +++ b/drivers/staging/wilc1000/Makefile @@ -1,7 +1,6 @@ obj-$(CONFIG_WILC1000) += wilc1000.o -ccflags-$(CONFIG_WILC1000_SDIO) += -DWILC_SDIO -DCOMPLEMENT_BOOT -ccflags-$(CONFIG_WILC1000_SPI) += -DWILC_SPI +ccflags-$(CONFIG_WILC1000_SDIO) += -DCOMPLEMENT_BOOT ccflags-y += -DSTA_FIRMWARE=\"atmel/wilc1000_fw.bin\" \ -DAP_FIRMWARE=\"atmel/wilc1000_ap_fw.bin\" \ diff --git a/drivers/staging/wilc1000/wilc_wlan.c b/drivers/staging/wilc1000/wilc_wlan.c index 5e37ec65d3bb..f72f976906cc 100644 --- a/drivers/staging/wilc1000/wilc_wlan.c +++ b/drivers/staging/wilc1000/wilc_wlan.c @@ -1067,7 +1067,10 @@ static void wilc_pllupdate_isr_ext(u32 int_stats) g_wlan.hif_func.hif_clear_int_ext(PLL_INT_CLR); - mdelay(WILC_PLL_TO); + if (g_wlan.io_type == HIF_SDIO) + mdelay(WILC_PLL_TO_SDIO); + else + mdelay(WILC_PLL_TO_SPI); while (!(ISWILC1000(wilc_get_chipid(true)) && --trials)) { PRINT_D(TX_DBG, "PLL update retrying\n"); diff --git a/drivers/staging/wilc1000/wilc_wlan.h b/drivers/staging/wilc1000/wilc_wlan.h index 44a590f80def..90ef650e722d 100644 --- a/drivers/staging/wilc1000/wilc_wlan.h +++ b/drivers/staging/wilc1000/wilc_wlan.h @@ -134,11 +134,8 @@ #define WILC_CFG_RSP_STATUS 2 #define WILC_CFG_RSP_SCAN 3 -#ifdef WILC_SDIO -#define WILC_PLL_TO 4 -#else -#define WILC_PLL_TO 2 -#endif +#define WILC_PLL_TO_SDIO 4 +#define WILC_PLL_TO_SPI 2 #define ABORT_INT BIT(31) /*******************************************/