From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932781AbbJPUpt (ORCPT ); Fri, 16 Oct 2015 16:45:49 -0400 Received: from mout.kundenserver.de ([212.227.17.10]:55480 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751589AbbJPUpr (ORCPT ); Fri, 16 Oct 2015 16:45:47 -0400 From: Arnd Bergmann To: gregkh@linuxfoundation.org Cc: Stanislav Kholmanskikh , Johnny Kim , Rachel Kim , Chris Park , Tony Cho , Glen Lee , Leo Kim , linux-wireless@vger.kernel.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH] staging/wilc: fix Kconfig dependencies, second try Date: Fri, 16 Oct 2015 22:45:39 +0200 Message-ID: <5446980.8Rmykv9Tt3@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Provags-ID: V03:K0:uVY8YDiSS6Ma9dAgKTVgSk4u84Wf9fCA7pWR9YTdwcEkWsiLXgS G1q14uBL4aHus3xgcU0zBYzvDZWl7+EqXIWRwpLj7MhKu4CpzIgWL2F8Tf1bdEnCMjMMIX6 gF6v372vb7Uf7xc7byOxTF80H0xRrDq6tW7D+HMjmMlB38YhjlUnt/ZhKyAQH9YIrU/Iw1f EGsV2wfSzxwogKvJ35l9A== X-UI-Out-Filterresults: notjunk:1;V01:K0:hxPQkSovC20=:is8FdFYho73+EYLlQkXLmP uvvEOl8eJf1kwTd77rGKe2M1/2fUnZLb3SwEQsqybB6Rmd4AZm8HDY0s4sfKPLNK6V5LDQrss G2Zn7Z+cLXPu+SBKbHS5yi3TZyv/5Mq4NSayAkJGNJkWuLbPWAg6Od57vcSJfjXY17MRZEh/O t+vIMNVycJrfkf+cdl4KAIlSvlN8o2MHY3PULeVrPptpualfEkqY9zrZzQa6yF5bA2Rtiviix yiwT5OGHja7rXKDCZvkFL/l26BR75+eL8HOn9FAjN5WnMJc6RDH/URx6detY9LnvzvvRdoZDH +8GArz33mG2l9XuBA0nhqWqE+mYjldX5O2pKCGkDCsp3kyFzUYPhDVC0ZT/Xw6sL1oBzblsOw qjxEeqBSEQ/ZaayY+ucL5zqhyXGn3wN7unvEnd1T58PMLOI/IAjS2e5mOGPFYc+V2gMX0DwGM RcqU9ThzeHJaQf5xCnKnShu7eiz8mcuhZsmhTeED3j8YSPYFG9A3JWASc+BBvpUihC9FvwuzH ChDZxrE7PyLjbxJLZeQQYdoooiNJGa8P0O0g+akZJ9l7ChxNCl8Ni5LEhTMQtJzRJvuf1Xebb 2/q0Yl/Jox5LUW33ab8siz4osycoP+Cgi/ORm/jWY0I1DI4pdi1C6dg/hFul69F7jZC35E8lU m2SMu6rz6ayp/2z67vcPlZNEfAVuerPvryopnp3Hu5zU1G4XTTXWfe6586o658oKTh+kDiNiw wjO8d249OO6d9b43 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org My first attempt to fix the Kconfig logic for wilc1000 was incomplete, as it missed the case where SPI is built-in while SDIO is modular and wilc1000 is configured as built-in in SPI mode (or vice versa), which would still lead to a link failure. This works around the problem by adding an intermediate Kconfig symbol "WILC1000_DRIVER" that controls visibility of the SDIO and SPI sub-drivers, so we can control the dependencies better. Signed-off-by: Arnd Bergmann Fixes: 9535ebc5e9cc ("staging/wilc1000: fix Kconfig dependencies") diff --git a/drivers/staging/wilc1000/Kconfig b/drivers/staging/wilc1000/Kconfig index 59ccecc316df..ee51b4278088 100644 --- a/drivers/staging/wilc1000/Kconfig +++ b/drivers/staging/wilc1000/Kconfig @@ -1,14 +1,16 @@ -config WILC1000 - tristate "WILC1000 support (WiFi only)" - depends on !S390 +config WILC1000_DRIVER + bool "WILC1000 support (WiFi only)" depends on CFG80211 && WEXT_CORE && INET - depends on MMC || SPI ---help--- This module only support IEEE 802.11n WiFi. +if WILC1000_DRIVER + +config WILC1000 + tristate + choice prompt "Memory Allocation" - depends on WILC1000 default WILC1000_PREALLOCATE_AT_LOADING_DRIVER config WILC1000_PREALLOCATE_AT_LOADING_DRIVER @@ -29,12 +31,12 @@ endchoice choice prompt "Bus Type" - depends on WILC1000 default WILC1000_SDIO - config WILC1000_SDIO +config WILC1000_SDIO bool "SDIO support" depends on MMC + select WILC1000 ---help--- This module adds support for the SDIO interface of adapters using WILC1000 chipset. The Atmel WILC1000 SDIO is a full speed interface. @@ -45,8 +47,9 @@ choice To use this interface, pin9 (SDIO_SPI_CFG) must be grounded. Select this if your platform is using the SDIO bus. - config WILC1000_SPI +config WILC1000_SPI depends on SPI + select WILC1000 bool "SPI support" ---help--- This module adds support for the SPI interface of adapters using @@ -60,7 +63,7 @@ endchoice config WILC1000_HW_OOB_INTR bool "Use out of band interrupt" - depends on WILC1000 && WILC1000_SDIO + depends on WILC1000_SDIO default n ---help--- This option enables out-of-band interrupt support for the WILC1000 @@ -68,3 +71,5 @@ config WILC1000_HW_OOB_INTR mechanism for SDIO host controllers that don't support SDIO interrupt. Select this option If the SDIO host controller in your platform doesn't support SDIO time devision interrupt. + +endif