| Message ID | 1623689796-8740-1-git-send-email-loic.poulain@linaro.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 89212e160b81e778f829b89743570665810e3b13 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] net: wwan: Fix WWAN config symbols | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Link |
| netdev/fixes_present | success | Link |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Clearly marked for net-next |
| netdev/subject_prefix | success | Link |
| netdev/cc_maintainers | warning | 1 maintainers not CCed: m.chetan.kumar@intel.com |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Link |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | success | Errors and warnings before: 1 this patch: 1 |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/verify_fixes | success | Link |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 63 lines checked |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 1 this patch: 1 |
| netdev/header_inline | success | Link |
Hello: This patch was applied to netdev/net-next.git (refs/heads/master): On Mon, 14 Jun 2021 18:56:36 +0200 you wrote: > There is not strong reason to have both WWAN and WWAN_CORE symbols, > Let's build the WWAN core framework when WWAN is selected, in the > same way as for other subsystems. > > This fixes issue with mhi_net selecting WWAN_CORE without WWAN and > reported by kernel test robot: > > [...] Here is the summary with links: - [net-next] net: wwan: Fix WWAN config symbols https://git.kernel.org/netdev/net-next/c/89212e160b81 You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 30d6e2f..6977f82 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -431,7 +431,7 @@ config VSOCKMON config MHI_NET tristate "MHI network driver" depends on MHI_BUS - select WWAN_CORE + select WWAN help This is the network driver for MHI bus. It can be used with QCOM based WWAN modems (like SDX55). Say Y or M. diff --git a/drivers/net/wwan/Kconfig b/drivers/net/wwan/Kconfig index 13613a4..249b3f1 100644 --- a/drivers/net/wwan/Kconfig +++ b/drivers/net/wwan/Kconfig @@ -3,15 +3,9 @@ # Wireless WAN device configuration # -menuconfig WWAN - bool "Wireless WAN" - help - This section contains Wireless WAN configuration for WWAN framework - and drivers. - -if WWAN +menu "Wireless WAN" -config WWAN_CORE +config WWAN tristate "WWAN Driver Core" help Say Y here if you want to use the WWAN driver core. This driver @@ -20,9 +14,10 @@ config WWAN_CORE To compile this driver as a module, choose M here: the module will be called wwan. +if WWAN + config WWAN_HWSIM tristate "Simulated WWAN device" - depends on WWAN_CORE help This driver is a developer testing tool that can be used to test WWAN framework. @@ -32,7 +27,6 @@ config WWAN_HWSIM config MHI_WWAN_CTRL tristate "MHI WWAN control driver for QCOM-based PCIe modems" - select WWAN_CORE depends on MHI_BUS help MHI WWAN CTRL allows QCOM-based PCIe modems to expose different modem @@ -46,7 +40,6 @@ config MHI_WWAN_CTRL config IOSM tristate "IOSM Driver for Intel M.2 WWAN Device" - select WWAN_CORE depends on INTEL_IOMMU help This driver enables Intel M.2 WWAN Device communication. @@ -57,3 +50,5 @@ config IOSM If unsure, say N. endif # WWAN + +endmenu diff --git a/drivers/net/wwan/Makefile b/drivers/net/wwan/Makefile index 3e565d3..83dd348 100644 --- a/drivers/net/wwan/Makefile +++ b/drivers/net/wwan/Makefile @@ -3,7 +3,7 @@ # Makefile for the Linux WWAN device drivers. # -obj-$(CONFIG_WWAN_CORE) += wwan.o +obj-$(CONFIG_WWAN) += wwan.o wwan-objs += wwan_core.o obj-$(CONFIG_WWAN_HWSIM) += wwan_hwsim.o
There is not strong reason to have both WWAN and WWAN_CORE symbols, Let's build the WWAN core framework when WWAN is selected, in the same way as for other subsystems. This fixes issue with mhi_net selecting WWAN_CORE without WWAN and reported by kernel test robot: Kconfig warnings: (for reference only) WARNING: unmet direct dependencies detected for WWAN_CORE Depends on NETDEVICES && WWAN Selected by - MHI_NET && NETDEVICES && NET_CORE && MHI_BUS Fixes: 9a44c1cc6388 ("net: Add a WWAN subsystem") Reported-by: kernel test robot <lkp@intel.com> Signed-off-by: Loic Poulain <loic.poulain@linaro.org> --- drivers/net/Kconfig | 2 +- drivers/net/wwan/Kconfig | 17 ++++++----------- drivers/net/wwan/Makefile | 2 +- 3 files changed, 8 insertions(+), 13 deletions(-)